fstests: clean up a couple of dm-flakey tests

Just little things I've found that should be cleaned up.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Zorro lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/generic/066 b/tests/generic/066
index 37d04e069e280b3ca04037c55467ad208bc220d4..9e4047a116802ad2d313d3c5c65e5eb19379a0c0 100755 (executable)
--- a/tests/generic/066
+++ b/tests/generic/066
@@ -24,6 +24,7 @@ _begin_fstest auto quick attr metadata log
 _cleanup()
 {
        _cleanup_flakey
+       cd /
        rm -f $tmp.*
 }
 
@@ -88,5 +89,7 @@ _flakey_drop_and_remount
 echo "xattr names and values after second fsync log replay:"
 _getfattr --absolute-names --dump $SCRATCH_MNT/foobar | _filter_scratch
 
+_unmount_flakey
+
 status=0
 exit

diff --git a/tests/generic/321 b/tests/generic/321
index 73a892334055de1a176cd22decc56fabe8bc2a25..df8f13597702a2959d5d37f63ae2736abc07ea4c 100755 (executable)
--- a/tests/generic/321
+++ b/tests/generic/321
@@ -13,6 +13,8 @@ _begin_fstest auto quick metadata log
 _cleanup()
 {
        _cleanup_flakey
+       cd /
+       rm -f $tmp.*
 }
 
 # Import common functions.
@@ -57,7 +59,7 @@ _rename_test()
        $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/bar
        $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/bar/foo
 
-       _flakey_drop_and_remount\
+       _flakey_drop_and_remount
 
        _ls_l $SCRATCH_MNT | tail -n +2 | awk '{ print $1, $9 }'
        _ls_l $SCRATCH_MNT/bar | tail -n +2 | awk '{ print $1, $9 }'

diff --git a/tests/xfs/051 b/tests/xfs/051
index fe3d75cab002bee6a896fad79b8b733b0227db86..ddc28ac9719fcd3b1a9b3e19ece8b04983aae99b 100755 (executable)
--- a/tests/xfs/051
+++ b/tests/xfs/051
@@ -11,6 +11,13 @@
 . ./common/preamble
 _begin_fstest shutdown auto log metadata
 
+_cleanup()
+{
+       _cleanup_flakey
+       cd /
+       rm -f $tmp.*
+}
+
 # Import common functions.
 . ./common/dmflakey