From 66b9b36805d7a932001983903ae2f7f5ce0c6107 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 11 Nov 2016 01:27:39 +0100 Subject: btrfs-progs: tests: refactor post-convert check helpers Separate checksum test from convert_test_post_check and use it to fix the broken test 005 as reported. References: https://bugzilla.kernel.org/show_bug.cgi?id=177141 Signed-off-by: David Sterba --- tests/convert-tests/005-delete-all-rollback/test.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'tests/convert-tests') diff --git a/tests/convert-tests/005-delete-all-rollback/test.sh b/tests/convert-tests/005-delete-all-rollback/test.sh index d498e5f8..cf576e70 100755 --- a/tests/convert-tests/005-delete-all-rollback/test.sh +++ b/tests/convert-tests/005-delete-all-rollback/test.sh @@ -34,9 +34,10 @@ do_test() { run_check_umount_test_dev convert_test_do_convert "$features" "$nodesize" - convert_test_post_check "$CHECKSUMTMP" run_check_mount_test_dev + convert_test_post_check_checksums "$CHECKSUMTMP" + here=$(pwd) cd "$TEST_MNT" || _fail "cannot cd to TEST_MNT" # ext2_saved/image must not be deleted @@ -45,10 +46,16 @@ do_test() { run_check $TOP/btrfs filesystem sync "$TEST_MNT" run_check_umount_test_dev convert_test_post_rollback - convert_test_post_check "$CHECKSUMTMP" + + run_check_mount_test_dev + convert_test_post_check_checksums "$CHECKSUMTMP" + run_check_umount_test_dev # mount again and verify checksums - convert_test_post_check "$CHECKSUMTMP" + run_check_mount_test_dev + convert_test_post_check_checksums "$CHECKSUMTMP" + run_check_umount_test_dev + rm "$CHECKSUMTMP" } -- cgit v1.2.3