[PATCH] btrfs-progs: misc-tests/029: exit manually after run_mayfail()

[PATCH] btrfs-progs: misc-tests/029: exit manually after run_mayfail()

[damenly.su]

From: Su Yue <Damenly_Su@gmx.com>

Since the commmit 8dd3e5dc2df5
("btrfs-progs: tests: fix misc-tests/029 to run on NFS") added the
compatibility of NFS, it called run_mayfail() in the last of the test.

However, run_mayfail() always return the original code. If the test
case is not running on NFS, the last `run_mayfail rmdir "$SUBVOL_MNT"`
will fail with return value 1 then the test fails:
================================================================
====== RUN MAYFAIL rmdir btrfs-progs/tests/misc-tests/029-send-p-different-mountpoints/subvol_mnt
rmdir: failed to remove 'btrfs-progs/tests/misc-tests/029-send-p-different-mountpoints/subvol_mnt': No such file or director
failed (ignored, ret=1): rmdir btrfs-progs/tests/misc-tests/029-send-p-different-mountpoints/subvol_mnt
test failed for case 029-send-p-different-mountpoints
=================================================================

Every instrument in this script handles its error well, so do exit 0
manually in the last.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=202645
Fixes: 8dd3e5dc2df5 ("btrfs-progs: tests: fix misc-tests/029 to run on NFS")
Signed-off-by: Su Yue <Damenly_Su@gmx.com>
---
 tests/misc-tests/029-send-p-different-mountpoints/test.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/misc-tests/029-send-p-different-mountpoints/test.sh b/tests/misc-tests/029-send-p-different-mountpoints/test.sh
index e092f8bba31e..d2b5e693f2d7 100755
--- a/tests/misc-tests/029-send-p-different-mountpoints/test.sh
+++ b/tests/misc-tests/029-send-p-different-mountpoints/test.sh
@@ -49,3 +49,6 @@ run_check_umount_test_dev "$TEST_MNT"
 
 run_mayfail $SUDO_HELPER rmdir "$SUBVOL_MNT"
 run_mayfail rmdir "$SUBVOL_MNT"
+# run_mayfail() may fail with nonzero value returned which causes failure
+# of this case. Do exit manually.
+exit 0
-- 
2.22.0

Re: [PATCH] btrfs-progs: misc-tests/029: exit manually after run_mayfail()

[David Sterba]

On Sun, Jun 23, 2019 at 06:53:24PM +0800, damenly.su@gmail.com wrote:
> From: Su Yue <Damenly_Su@gmx.com>
> 
> Since the commmit 8dd3e5dc2df5
> ("btrfs-progs: tests: fix misc-tests/029 to run on NFS") added the
> compatibility of NFS, it called run_mayfail() in the last of the test.
> 
> However, run_mayfail() always return the original code. If the test
> case is not running on NFS, the last `run_mayfail rmdir "$SUBVOL_MNT"`
> will fail with return value 1 then the test fails:
> ================================================================
> ====== RUN MAYFAIL rmdir btrfs-progs/tests/misc-tests/029-send-p-different-mountpoints/subvol_mnt
> rmdir: failed to remove 'btrfs-progs/tests/misc-tests/029-send-p-different-mountpoints/subvol_mnt': No such file or director
> failed (ignored, ret=1): rmdir btrfs-progs/tests/misc-tests/029-send-p-different-mountpoints/subvol_mnt
> test failed for case 029-send-p-different-mountpoints
> =================================================================
> 
> Every instrument in this script handles its error well, so do exit 0
> manually in the last.
> 
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=202645
> Fixes: 8dd3e5dc2df5 ("btrfs-progs: tests: fix misc-tests/029 to run on NFS")
> Signed-off-by: Su Yue <Damenly_Su@gmx.com>

Applied, thanks.