Re: [PATCH] btrfs-progs: test: add new cli-test for subvol get/set-default

[David Sterba <dsterba@xxxxxxx>]

On Wed, Oct 18, 2017 at 11:00:43AM +0900, Misono, Tomohiro wrote:
> Add new test to check functionality of subvol get/set-default.
> 
> Signed-off-by: Tomohiro Misono <misono.tomohiro@xxxxxxxxxxxxxx>

Thanks, applied with the following diff to fix style and failures
when the test is not run as root initially:

- no command shortcuts
- the subvolume id for set-default should be read from rootid
- add missing SUDO_HELPER
- prepare_test_dev without the device size (unless justified)

--- a/tests/cli-tests/008-subvolume-get-set-default/test.sh
+++ b/tests/cli-tests/008-subvolume-get-set-default/test.sh
@@ -3,7 +3,7 @@

 check_default_id()
 {
-       id=$(run_check_stdout $SUDO_HELPER "$TOP/btrfs" sub get-def .) \
+       id=$(run_check_stdout $SUDO_HELPER "$TOP/btrfs" subvolume get-default .) \
                || { echo "$id"; exit 1; }
        if $(echo "$id" | grep -vq "ID $1"); then
                _fail "subvolume get-default: default id is not $1, but $id"
@@ -16,7 +16,7 @@ check_prereq mkfs.btrfs
 check_prereq btrfs

 setup_root_helper
-prepare_test_dev 2g
+prepare_test_dev

 run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
 run_check_mount_test_dev
@@ -25,21 +25,23 @@ cd "$TEST_MNT"
 check_default_id 5

 # check "subvol set-default <subvolid> <path>"
-run_check "$TOP/btrfs" subvol create sub
-run_check $SUDO_HELPER "$TOP/btrfs" subvol set-default 257 .
-check_default_id 257
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume create sub
+id=$(run_check_stdout "$TOP/btrfs" inspect-internal rootid sub)
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume set-default "$id" .
+check_default_id "$id"

 run_mustfail "set-default to non existent id" \
-       $SUDO_HELPER "$TOP/btrfs" subvol set-default 100 .
+       $SUDO_HELPER "$TOP/btrfs" subvolume set-default 100 .

 # check "subvol set-default <subvolume>"
-run_check "$TOP/btrfs" subvol create sub2
-run_check $SUDO_HELPER "$TOP/btrfs" subvol set-default ./sub2
-check_default_id 258
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume create sub2
+id=$(run_check_stdout "$TOP/btrfs" inspect-internal rootid sub2)
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume set-default ./sub2
+check_default_id "$id"

-run_check mkdir sub2/dir
+run_check $SUDO_HELPER mkdir sub2/dir
 run_mustfail "set-default to normal directory" \
-       $SUDO_HELPER "$TOP/btrfs" subvol set-default ./sub2/dir
+       $SUDO_HELPER "$TOP/btrfs" subvolume set-default ./sub2/dir

 cd ..
 run_check_umount_test_dev
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html