btrfs-progs: tests: fixup mount tests of fsck/028-unaligned-super-dev-sizes
authorDavid Sterba <dsterba@suse.com>
Tue, 30 Jan 2018 17:26:46 +0000 (18:26 +0100)
committerDavid Sterba <dsterba@suse.com>
Wed, 31 Jan 2018 14:14:03 +0000 (15:14 +0100)
This test was broken because it tried to mount a different image than
what it had repaired.

Signed-off-by: David Sterba <dsterba@suse.com>
tests/fsck-tests/028-unaligned-super-dev-sizes/test.sh

index 6f315fa..3928f54 100755 (executable)
@@ -6,21 +6,18 @@
 source "$TOP/tests/common"
 
 check_prereq btrfs
 source "$TOP/tests/common"
 
 check_prereq btrfs
-prepare_test_dev
 setup_root_helper
 
 check_all_images
 
 setup_root_helper
 
 check_all_images
 
-image=$(extract_image "./dev_and_super_mismatch_unaligned.raw.xz")
+TEST_DEV=$(extract_image "./dev_and_super_mismatch_unaligned.raw.xz")
 
 # detect and fix
 
 # detect and fix
-run_check "$TOP/btrfs" rescue fix-device-size "$image"
+run_check "$TOP/btrfs" rescue fix-device-size "$TEST_DEV"
 # no problem found
 # no problem found
-run_check "$TOP/btrfs" rescue fix-device-size "$image"
+run_check "$TOP/btrfs" rescue fix-device-size "$TEST_DEV"
 # check if fix-device-size worked
 # check if fix-device-size worked
-run_check "$TOP/btrfs" check "$image"
+run_check "$TOP/btrfs" check "$TEST_DEV"
 # mount test
 run_check_mount_test_dev
 # mount test
 run_check_mount_test_dev
-run_check_umount_test_dev
-
-rm -f "$image"
+run_check_umount_test_dev "$TEST_MNT"