diff options
author | David Sterba <dsterba@suse.com> | 2016-11-18 15:02:50 +0100 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2016-11-23 10:51:21 +0100 |
commit | 6572f884ba0958af7591947028cec5adcbf21193 (patch) | |
tree | fb219d7ca3b4a68114ae47443f1b238cc2233ca2 /tests/misc-tests | |
parent | a2214e582cb77a17d460218489f9affedff5b049 (diff) |
btrfs-progs: tests: use the root helper for various info retrieval commands
The current user might not be able to peek into the loop files directly,
use the helper. Discovered by running tests in travis.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'tests/misc-tests')
-rwxr-xr-x | tests/misc-tests/006-image-on-missing-device/test.sh | 4 | ||||
-rwxr-xr-x | tests/misc-tests/010-convert-delete-ext2-subvol/test.sh | 4 | ||||
-rwxr-xr-x | tests/misc-tests/011-delete-missing-device/test.sh | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/misc-tests/006-image-on-missing-device/test.sh b/tests/misc-tests/006-image-on-missing-device/test.sh index 83a6a056..8133d2b1 100755 --- a/tests/misc-tests/006-image-on-missing-device/test.sh +++ b/tests/misc-tests/006-image-on-missing-device/test.sh @@ -60,12 +60,12 @@ test_run() run_check $SUDO_HELPER umount $TEST_MNT test_image_dump - run_check $TOP/btrfs filesystem show $dev1 + run_check $SUDO_HELPER $TOP/btrfs filesystem show $dev1 # create a degraded raid1 filesystem, check must succeed # btrfs-image must not loop run_mayfail wipefs -a $dev2 run_check $SUDO_HELPER losetup -d $dev2 - run_check $TOP/btrfs filesystem show $dev1 + run_check $SUDO_HELPER $TOP/btrfs filesystem show $dev1 test_image_dump } diff --git a/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh b/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh index 7bf7be34..7915867c 100755 --- a/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh +++ b/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh @@ -14,11 +14,11 @@ prepare_test_dev run_check truncate -s 2G "$TEST_DEV" run_check mkfs.ext4 -F "$TEST_DEV" run_check $TOP/btrfs-convert "$TEST_DEV" -run_check $TOP/btrfs inspect-internal dump-tree "$TEST_DEV" +run_check $SUDO_HELPER $TOP/btrfs inspect-internal dump-tree "$TEST_DEV" run_check_mount_test_dev run_check $SUDO_HELPER $TOP/btrfs subvolume delete -c "$TEST_MNT/ext2_saved" run_check_umount_test_dev -run_check $TOP/btrfs inspect-internal dump-tree "$TEST_DEV" +run_check $SUDO_HELPER $TOP/btrfs inspect-internal dump-tree "$TEST_DEV" run_check_stdout $TOP/btrfs-convert --rollback "$TEST_DEV" | grep -q 'is it deleted' || _fail "unexpected rollback" diff --git a/tests/misc-tests/011-delete-missing-device/test.sh b/tests/misc-tests/011-delete-missing-device/test.sh index 57e88745..0222b6f8 100755 --- a/tests/misc-tests/011-delete-missing-device/test.sh +++ b/tests/misc-tests/011-delete-missing-device/test.sh @@ -38,16 +38,16 @@ cleanup_devices() test_do_mkfs() { run_check $SUDO_HELPER $TOP/mkfs.btrfs -f $@ ${devs[@]} - run_check $TOP/btrfs inspect-internal dump-super $dev1 + run_check $SUDO_HELPER $TOP/btrfs inspect-internal dump-super $dev1 run_check $SUDO_HELPER $TOP/btrfs check $dev1 - run_check $TOP/btrfs filesystem show + run_check $SUDO_HELPER $TOP/btrfs filesystem show } test_wipefs() { - run_check wipefs -a $devtodel + run_check $SUDO_HELPER wipefs -a $devtodel run_check $SUDO_HELPER losetup -d $devtodel - run_check losetup -a + run_check $SUDO_HELPER losetup --all run_check $TOP/btrfs filesystem show } test_delete_missing() |