From d75f0c12d2de062dd84c2aefa640c21dc0571c5b Mon Sep 17 00:00:00 2001 From: David Sterba Date: Sun, 20 Mar 2016 15:34:10 +0100 Subject: btrfs-progs: tests: add support for command line coverage tests Signed-off-by: David Sterba --- tests/cli-tests/001-btrfs/test.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 tests/cli-tests/001-btrfs/test.sh (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/001-btrfs/test.sh b/tests/cli-tests/001-btrfs/test.sh new file mode 100755 index 00000000..1de2f6f2 --- /dev/null +++ b/tests/cli-tests/001-btrfs/test.sh @@ -0,0 +1,15 @@ +#!/bin/bash +# test commands of btrfs + +source $TOP/tests/common + +check_prereq btrfs + +# returns 1 +run_mayfail $TOP/btrfs || true +run_check $TOP/btrfs version +run_check $TOP/btrfs version -- +run_check $TOP/btrfs help +run_check $TOP/btrfs help -- +run_check $TOP/btrfs --help +run_check $TOP/btrfs --help --full -- cgit v1.2.3 From 0121270a799df52dab8de852b326ebdaf05e19c9 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 2 May 2016 14:59:48 +0200 Subject: btrfs-progs: tests: add 002-balance-full-no-filters Coverage of new balance option --full-balance. Signed-off-by: David Sterba --- tests/cli-tests/002-balance-full-no-filters/test.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 tests/cli-tests/002-balance-full-no-filters/test.sh (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/002-balance-full-no-filters/test.sh b/tests/cli-tests/002-balance-full-no-filters/test.sh new file mode 100755 index 00000000..c2757f24 --- /dev/null +++ b/tests/cli-tests/002-balance-full-no-filters/test.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# +# coverage of balance --full-balance + +source $TOP/tests/common + +check_prereq mkfs.btrfs +check_prereq btrfs + +setup_root_helper +prepare_test_dev 2g + +run_check $TOP/mkfs.btrfs -f $IMAGE +run_check_mount_test_dev + +run_check $SUDO_HELPER $TOP/btrfs balance start --full-balance $TEST_MNT +run_check $SUDO_HELPER $TOP/btrfs balance start $TEST_MNT +run_check $SUDO_HELPER $TOP/btrfs balance --full-balance $TEST_MNT +run_check $SUDO_HELPER $TOP/btrfs balance $TEST_MNT + +run_check_umount_test_dev -- cgit v1.2.3 From 81b427afcf105420a25cb3a35be478c9f43f069e Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 16 Jun 2016 13:50:18 +0200 Subject: btrfs-progs: tests: add 003-fi-resize-args Check various resize option combinations. Signed-off-by: David Sterba --- tests/cli-tests/003-fi-resize-args/test.sh | 46 ++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100755 tests/cli-tests/003-fi-resize-args/test.sh (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/003-fi-resize-args/test.sh b/tests/cli-tests/003-fi-resize-args/test.sh new file mode 100755 index 00000000..2f136fa2 --- /dev/null +++ b/tests/cli-tests/003-fi-resize-args/test.sh @@ -0,0 +1,46 @@ +#!/bin/bash +# +# test parsing of various resize arguments + +source $TOP/tests/common + +check_prereq mkfs.btrfs +check_prereq btrfs + +setup_root_helper +prepare_test_dev 2g + +run_check $TOP/mkfs.btrfs -f $IMAGE +run_check_mount_test_dev + +# missing the one of the required arguments +for sep in '' '--'; do + run_check_stdout $TOP/btrfs filesystem resize $sep | + grep -q "btrfs filesystem resize: too few arguments" + run_check_stdout $TOP/btrfs filesystem resize $sep $TEST_MNT | + grep -q "btrfs filesystem resize: too few arguments" + run_check_stdout $TOP/btrfs filesystem resize $sep -128M | + grep -q "btrfs filesystem resize: too few arguments" + run_check_stdout $TOP/btrfs filesystem resize $sep +128M | + grep -q "btrfs filesystem resize: too few arguments" + run_check_stdout $TOP/btrfs filesystem resize $sep 512M | + grep -q "btrfs filesystem resize: too few arguments" + run_check_stdout $TOP/btrfs filesystem resize $sep 1:-128M | + grep -q "btrfs filesystem resize: too few arguments" + run_check_stdout $TOP/btrfs filesystem resize $sep 1:512M | + grep -q "btrfs filesystem resize: too few arguments" + run_check_stdout $TOP/btrfs filesystem resize $sep 1:+128M | + grep -q "btrfs filesystem resize: too few arguments" +done + +# valid resize +for sep in '' '--'; do + run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep -128M $TEST_MNT + run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep +128M $TEST_MNT + run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep 512M $TEST_MNT + run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep 1:-128M $TEST_MNT + run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep 1:512M $TEST_MNT + run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep 1:+128M $TEST_MNT +done + +run_check_umount_test_dev -- cgit v1.2.3 From 29a1a78aaacbd02e59f61b25bd2b25244e948d5d Mon Sep 17 00:00:00 2001 From: David Sterba Date: Wed, 2 Nov 2016 13:07:15 +0100 Subject: btrfs-progs: tests: add test for multi-subvolume send from parent Fixed by "btrfs-progs: send: fix handling of multiple snapshots (-p option)". Signed-off-by: David Sterba --- .../cli-tests/004-send-parent-multi-subvol/test.sh | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 tests/cli-tests/004-send-parent-multi-subvol/test.sh (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/004-send-parent-multi-subvol/test.sh b/tests/cli-tests/004-send-parent-multi-subvol/test.sh new file mode 100755 index 00000000..e9ccf225 --- /dev/null +++ b/tests/cli-tests/004-send-parent-multi-subvol/test.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# +# minimal test for the following syntax: btrfs send -p parent subvol1 subvol2 + +source $TOP/tests/common + +check_prereq mkfs.btrfs +check_prereq btrfs + +setup_root_helper +prepare_test_dev 2g + +run_check $TOP/mkfs.btrfs -f $IMAGE +run_check_mount_test_dev + +here=`pwd` +cd "$TEST_MNT" || _fail "cannot chdir to TEST_MNT" + +run_check $SUDO_HELPER btrfs subvolume create subv-parent +run_check $SUDO_HELPER dd if=/dev/urandom of=subv-parent/file bs=1M count=10 +run_check $SUDO_HELPER btrfs subvolume snapshot -r subv-parent subv-snap1 +run_check $SUDO_HELPER dd if=/dev/urandom of=subv-parent/file bs=1M count=10 +run_check $SUDO_HELPER btrfs subvolume snapshot -r subv-parent subv-snap2 +run_check $SUDO_HELPER dd if=/dev/urandom of=subv-parent/file bs=1M count=10 +run_check $SUDO_HELPER btrfs subvolume snapshot -r subv-parent subv-snap3 + +run_check truncate -s0 "$here"/send.stream +run_check chmod a+w "$here"/send.stream +run_check $SUDO_HELPER $TOP/btrfs send -f "$here"/send.stream -p subv-snap1 subv-snap2 subv-snap3 + +cd "$here" || _fail "cannot chdir back to test directory" +rm send.stream + +run_check_umount_test_dev -- cgit v1.2.3 From 26ad474e16637e34a91aec8cf9df206d51a0865a Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 21 Nov 2016 14:55:11 +0100 Subject: btrfs-progs: tests: add more gobal option to test 001-btrfs Signed-off-by: David Sterba --- tests/cli-tests/001-btrfs/test.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/001-btrfs/test.sh b/tests/cli-tests/001-btrfs/test.sh index 1de2f6f2..560e4890 100755 --- a/tests/cli-tests/001-btrfs/test.sh +++ b/tests/cli-tests/001-btrfs/test.sh @@ -11,5 +11,8 @@ run_check $TOP/btrfs version run_check $TOP/btrfs version -- run_check $TOP/btrfs help run_check $TOP/btrfs help -- +run_check $TOP/btrfs help --full run_check $TOP/btrfs --help run_check $TOP/btrfs --help --full +run_check $TOP/btrfs --version +run_check $TOP/btrfs --version --help -- cgit v1.2.3 From 0e95fff4fff4688c82c150833a021a9399da094c Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 20 Jan 2017 17:54:04 +0100 Subject: btrfs-progs: tests: 005-qgroup-show Signed-off-by: David Sterba --- tests/cli-tests/005-qgroup-show/test.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 tests/cli-tests/005-qgroup-show/test.sh (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/005-qgroup-show/test.sh b/tests/cli-tests/005-qgroup-show/test.sh new file mode 100755 index 00000000..28c22c61 --- /dev/null +++ b/tests/cli-tests/005-qgroup-show/test.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# +# qgroup show behaviour when quotas are not enabled + +source $TOP/tests/common + +check_prereq mkfs.btrfs +check_prereq btrfs + +setup_root_helper +prepare_test_dev 2g + +run_check $TOP/mkfs.btrfs -f $IMAGE +run_check_mount_test_dev +run_mayfail $TOP/btrfs qgroup show "$TEST_MNT" +run_mayfail $SUDO_HELPER $TOP/btrfs qgroup show "$TEST_MNT" +run_check $SUDO_HELPER $TOP/btrfs quota enable "$TEST_MNT" +run_mayfail $TOP/btrfs qgroup show "$TEST_MNT" +run_check $SUDO_HELPER $TOP/btrfs qgroup show "$TEST_MNT" +run_check $SUDO_HELPER $TOP/btrfs quota disable "$TEST_MNT" +run_check_umount_test_dev -- cgit v1.2.3 From 55e3a601951302641c4fd5e148f46449acc449c2 Mon Sep 17 00:00:00 2001 From: Tsutomu Itoh Date: Thu, 15 Dec 2016 13:33:05 +0900 Subject: btrfs-progs: tests: add test for --sync option of qgroup show Simple test script for the following patch. btrfs-progs: qgroup: add sync option to 'qgroup show' Signed-off-by: Tsutomu Itoh Signed-off-by: David Sterba --- tests/cli-tests/006-qgroup-show-sync/test.sh | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 tests/cli-tests/006-qgroup-show-sync/test.sh (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/006-qgroup-show-sync/test.sh b/tests/cli-tests/006-qgroup-show-sync/test.sh new file mode 100755 index 00000000..30d0a9a1 --- /dev/null +++ b/tests/cli-tests/006-qgroup-show-sync/test.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# +# simple test of qgroup show --sync option + +source "$TOP/tests/common" + +check_prereq mkfs.btrfs +check_prereq btrfs + +setup_root_helper +prepare_test_dev 1g + +run_check "$TOP/mkfs.btrfs" -f "$IMAGE" +run_check_mount_test_dev + +run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/Sub" +run_check $SUDO_HELPER "$TOP/btrfs" quota enable "$TEST_MNT/Sub" + +for opt in '' '--' '--sync'; do + run_check $SUDO_HELPER "$TOP/btrfs" qgroup limit 300M "$TEST_MNT/Sub" + run_check $SUDO_HELPER dd if=/dev/zero of="$TEST_MNT/Sub/file" bs=1M count=200 + + run_check $SUDO_HELPER "$TOP/btrfs" qgroup show -re $opt "$TEST_MNT/Sub" + + run_check $SUDO_HELPER "$TOP/btrfs" qgroup limit none "$TEST_MNT/Sub" + run_check $SUDO_HELPER rm -f "$TEST_MNT/Sub/file" + run_check "$TOP/btrfs" filesystem sync "$TEST_MNT/Sub" +done + +run_check_umount_test_dev -- cgit v1.2.3 From 21821424715214a6252708f2322e2f4882c967ab Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 24 Jan 2017 17:59:47 +0100 Subject: btrfs-progs: tests: add variable quotation to cli-tests Signed-off-by: David Sterba --- tests/cli-tests/001-btrfs/test.sh | 20 +++++++------- .../cli-tests/002-balance-full-no-filters/test.sh | 12 ++++---- tests/cli-tests/003-fi-resize-args/test.sh | 32 +++++++++++----------- .../cli-tests/004-send-parent-multi-subvol/test.sh | 6 ++-- tests/cli-tests/005-qgroup-show/test.sh | 16 +++++------ 5 files changed, 43 insertions(+), 43 deletions(-) (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/001-btrfs/test.sh b/tests/cli-tests/001-btrfs/test.sh index 560e4890..c680604b 100755 --- a/tests/cli-tests/001-btrfs/test.sh +++ b/tests/cli-tests/001-btrfs/test.sh @@ -1,18 +1,18 @@ #!/bin/bash # test commands of btrfs -source $TOP/tests/common +source "$TOP/tests/common" check_prereq btrfs # returns 1 run_mayfail $TOP/btrfs || true -run_check $TOP/btrfs version -run_check $TOP/btrfs version -- -run_check $TOP/btrfs help -run_check $TOP/btrfs help -- -run_check $TOP/btrfs help --full -run_check $TOP/btrfs --help -run_check $TOP/btrfs --help --full -run_check $TOP/btrfs --version -run_check $TOP/btrfs --version --help +run_check "$TOP/btrfs" version +run_check "$TOP/btrfs" version -- +run_check "$TOP/btrfs" help +run_check "$TOP/btrfs" help -- +run_check "$TOP/btrfs" help --full +run_check "$TOP/btrfs" --help +run_check "$TOP/btrfs" --help --full +run_check "$TOP/btrfs" --version +run_check "$TOP/btrfs" --version --help diff --git a/tests/cli-tests/002-balance-full-no-filters/test.sh b/tests/cli-tests/002-balance-full-no-filters/test.sh index c2757f24..81a719eb 100755 --- a/tests/cli-tests/002-balance-full-no-filters/test.sh +++ b/tests/cli-tests/002-balance-full-no-filters/test.sh @@ -2,7 +2,7 @@ # # coverage of balance --full-balance -source $TOP/tests/common +source "$TOP/tests/common" check_prereq mkfs.btrfs check_prereq btrfs @@ -10,12 +10,12 @@ check_prereq btrfs setup_root_helper prepare_test_dev 2g -run_check $TOP/mkfs.btrfs -f $IMAGE +run_check "$TOP/mkfs.btrfs" -f "$IMAGE" run_check_mount_test_dev -run_check $SUDO_HELPER $TOP/btrfs balance start --full-balance $TEST_MNT -run_check $SUDO_HELPER $TOP/btrfs balance start $TEST_MNT -run_check $SUDO_HELPER $TOP/btrfs balance --full-balance $TEST_MNT -run_check $SUDO_HELPER $TOP/btrfs balance $TEST_MNT +run_check $SUDO_HELPER "$TOP/btrfs" balance start --full-balance "$TEST_MNT" +run_check $SUDO_HELPER "$TOP/btrfs" balance start "$TEST_MNT" +run_check $SUDO_HELPER "$TOP/btrfs" balance --full-balance "$TEST_MNT" +run_check $SUDO_HELPER "$TOP/btrfs" balance "$TEST_MNT" run_check_umount_test_dev diff --git a/tests/cli-tests/003-fi-resize-args/test.sh b/tests/cli-tests/003-fi-resize-args/test.sh index 2f136fa2..b835e078 100755 --- a/tests/cli-tests/003-fi-resize-args/test.sh +++ b/tests/cli-tests/003-fi-resize-args/test.sh @@ -2,7 +2,7 @@ # # test parsing of various resize arguments -source $TOP/tests/common +source "$TOP/tests/common" check_prereq mkfs.btrfs check_prereq btrfs @@ -10,37 +10,37 @@ check_prereq btrfs setup_root_helper prepare_test_dev 2g -run_check $TOP/mkfs.btrfs -f $IMAGE +run_check "$TOP/mkfs.btrfs" -f "$IMAGE" run_check_mount_test_dev # missing the one of the required arguments for sep in '' '--'; do - run_check_stdout $TOP/btrfs filesystem resize $sep | + run_check_stdout "$TOP/btrfs" filesystem resize $sep | grep -q "btrfs filesystem resize: too few arguments" - run_check_stdout $TOP/btrfs filesystem resize $sep $TEST_MNT | + run_check_stdout "$TOP/btrfs" filesystem resize $sep "$TEST_MNT" | grep -q "btrfs filesystem resize: too few arguments" - run_check_stdout $TOP/btrfs filesystem resize $sep -128M | + run_check_stdout "$TOP/btrfs" filesystem resize $sep -128M | grep -q "btrfs filesystem resize: too few arguments" - run_check_stdout $TOP/btrfs filesystem resize $sep +128M | + run_check_stdout "$TOP/btrfs" filesystem resize $sep +128M | grep -q "btrfs filesystem resize: too few arguments" - run_check_stdout $TOP/btrfs filesystem resize $sep 512M | + run_check_stdout "$TOP/btrfs" filesystem resize $sep 512M | grep -q "btrfs filesystem resize: too few arguments" - run_check_stdout $TOP/btrfs filesystem resize $sep 1:-128M | + run_check_stdout "$TOP/btrfs" filesystem resize $sep 1:-128M | grep -q "btrfs filesystem resize: too few arguments" - run_check_stdout $TOP/btrfs filesystem resize $sep 1:512M | + run_check_stdout "$TOP/btrfs" filesystem resize $sep 1:512M | grep -q "btrfs filesystem resize: too few arguments" - run_check_stdout $TOP/btrfs filesystem resize $sep 1:+128M | + run_check_stdout "$TOP/btrfs" filesystem resize $sep 1:+128M | grep -q "btrfs filesystem resize: too few arguments" done # valid resize for sep in '' '--'; do - run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep -128M $TEST_MNT - run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep +128M $TEST_MNT - run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep 512M $TEST_MNT - run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep 1:-128M $TEST_MNT - run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep 1:512M $TEST_MNT - run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep 1:+128M $TEST_MNT + run_check $SUDO_HELPER "$TOP/btrfs" filesystem resize $sep -128M "$TEST_MNT" + run_check $SUDO_HELPER "$TOP/btrfs" filesystem resize $sep +128M "$TEST_MNT" + run_check $SUDO_HELPER "$TOP/btrfs" filesystem resize $sep 512M "$TEST_MNT" + run_check $SUDO_HELPER "$TOP/btrfs" filesystem resize $sep 1:-128M "$TEST_MNT" + run_check $SUDO_HELPER "$TOP/btrfs" filesystem resize $sep 1:512M "$TEST_MNT" + run_check $SUDO_HELPER "$TOP/btrfs" filesystem resize $sep 1:+128M "$TEST_MNT" done run_check_umount_test_dev diff --git a/tests/cli-tests/004-send-parent-multi-subvol/test.sh b/tests/cli-tests/004-send-parent-multi-subvol/test.sh index e9ccf225..860f657a 100755 --- a/tests/cli-tests/004-send-parent-multi-subvol/test.sh +++ b/tests/cli-tests/004-send-parent-multi-subvol/test.sh @@ -2,7 +2,7 @@ # # minimal test for the following syntax: btrfs send -p parent subvol1 subvol2 -source $TOP/tests/common +source "$TOP/tests/common" check_prereq mkfs.btrfs check_prereq btrfs @@ -10,7 +10,7 @@ check_prereq btrfs setup_root_helper prepare_test_dev 2g -run_check $TOP/mkfs.btrfs -f $IMAGE +run_check "$TOP/mkfs.btrfs" -f "$IMAGE" run_check_mount_test_dev here=`pwd` @@ -26,7 +26,7 @@ run_check $SUDO_HELPER btrfs subvolume snapshot -r subv-parent subv-snap3 run_check truncate -s0 "$here"/send.stream run_check chmod a+w "$here"/send.stream -run_check $SUDO_HELPER $TOP/btrfs send -f "$here"/send.stream -p subv-snap1 subv-snap2 subv-snap3 +run_check $SUDO_HELPER "$TOP/btrfs" send -f "$here"/send.stream -p subv-snap1 subv-snap2 subv-snap3 cd "$here" || _fail "cannot chdir back to test directory" rm send.stream diff --git a/tests/cli-tests/005-qgroup-show/test.sh b/tests/cli-tests/005-qgroup-show/test.sh index 28c22c61..46d3c3a7 100755 --- a/tests/cli-tests/005-qgroup-show/test.sh +++ b/tests/cli-tests/005-qgroup-show/test.sh @@ -2,7 +2,7 @@ # # qgroup show behaviour when quotas are not enabled -source $TOP/tests/common +source "$TOP/tests/common" check_prereq mkfs.btrfs check_prereq btrfs @@ -10,12 +10,12 @@ check_prereq btrfs setup_root_helper prepare_test_dev 2g -run_check $TOP/mkfs.btrfs -f $IMAGE +run_check "$TOP/mkfs.btrfs" -f "$IMAGE" run_check_mount_test_dev -run_mayfail $TOP/btrfs qgroup show "$TEST_MNT" -run_mayfail $SUDO_HELPER $TOP/btrfs qgroup show "$TEST_MNT" -run_check $SUDO_HELPER $TOP/btrfs quota enable "$TEST_MNT" -run_mayfail $TOP/btrfs qgroup show "$TEST_MNT" -run_check $SUDO_HELPER $TOP/btrfs qgroup show "$TEST_MNT" -run_check $SUDO_HELPER $TOP/btrfs quota disable "$TEST_MNT" +run_mayfail "$TOP/btrfs" qgroup show "$TEST_MNT" +run_mayfail $SUDO_HELPER "$TOP/btrfs" qgroup show "$TEST_MNT" +run_check $SUDO_HELPER "$TOP/btrfs" quota enable "$TEST_MNT" +run_mayfail "$TOP/btrfs" qgroup show "$TEST_MNT" +run_check $SUDO_HELPER "$TOP/btrfs" qgroup show "$TEST_MNT" +run_check $SUDO_HELPER "$TOP/btrfs" quota disable "$TEST_MNT" run_check_umount_test_dev -- cgit v1.2.3 From 78e1787c55a28f496d210b2805d84539d86552a1 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 24 Jan 2017 18:19:27 +0100 Subject: btrfs-progs: tests: use built binaries for 004-send-parent-multi-subvol Signed-off-by: David Sterba --- tests/cli-tests/004-send-parent-multi-subvol/test.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/004-send-parent-multi-subvol/test.sh b/tests/cli-tests/004-send-parent-multi-subvol/test.sh index 860f657a..72a9eb36 100755 --- a/tests/cli-tests/004-send-parent-multi-subvol/test.sh +++ b/tests/cli-tests/004-send-parent-multi-subvol/test.sh @@ -16,13 +16,13 @@ run_check_mount_test_dev here=`pwd` cd "$TEST_MNT" || _fail "cannot chdir to TEST_MNT" -run_check $SUDO_HELPER btrfs subvolume create subv-parent +run_check $SUDO_HELPER "$TOP/btrfs" subvolume create subv-parent run_check $SUDO_HELPER dd if=/dev/urandom of=subv-parent/file bs=1M count=10 -run_check $SUDO_HELPER btrfs subvolume snapshot -r subv-parent subv-snap1 +run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot -r subv-parent subv-snap1 run_check $SUDO_HELPER dd if=/dev/urandom of=subv-parent/file bs=1M count=10 -run_check $SUDO_HELPER btrfs subvolume snapshot -r subv-parent subv-snap2 +run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot -r subv-parent subv-snap2 run_check $SUDO_HELPER dd if=/dev/urandom of=subv-parent/file bs=1M count=10 -run_check $SUDO_HELPER btrfs subvolume snapshot -r subv-parent subv-snap3 +run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot -r subv-parent subv-snap3 run_check truncate -s0 "$here"/send.stream run_check chmod a+w "$here"/send.stream -- cgit v1.2.3 From b7eb8f7650c6707dc3a45835955db4a770d90b68 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 13 Mar 2017 17:48:55 +0100 Subject: btrfs-progs: tests: use TEST_DEV in cli-tests IMAGE points to the fallback image, tests should use TEST_DEV. Signed-off-by: David Sterba --- tests/cli-tests/002-balance-full-no-filters/test.sh | 2 +- tests/cli-tests/003-fi-resize-args/test.sh | 2 +- tests/cli-tests/004-send-parent-multi-subvol/test.sh | 2 +- tests/cli-tests/005-qgroup-show/test.sh | 2 +- tests/cli-tests/006-qgroup-show-sync/test.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/002-balance-full-no-filters/test.sh b/tests/cli-tests/002-balance-full-no-filters/test.sh index 81a719eb..0501aad2 100755 --- a/tests/cli-tests/002-balance-full-no-filters/test.sh +++ b/tests/cli-tests/002-balance-full-no-filters/test.sh @@ -10,7 +10,7 @@ check_prereq btrfs setup_root_helper prepare_test_dev 2g -run_check "$TOP/mkfs.btrfs" -f "$IMAGE" +run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" run_check_mount_test_dev run_check $SUDO_HELPER "$TOP/btrfs" balance start --full-balance "$TEST_MNT" diff --git a/tests/cli-tests/003-fi-resize-args/test.sh b/tests/cli-tests/003-fi-resize-args/test.sh index b835e078..e4f262b6 100755 --- a/tests/cli-tests/003-fi-resize-args/test.sh +++ b/tests/cli-tests/003-fi-resize-args/test.sh @@ -10,7 +10,7 @@ check_prereq btrfs setup_root_helper prepare_test_dev 2g -run_check "$TOP/mkfs.btrfs" -f "$IMAGE" +run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" run_check_mount_test_dev # missing the one of the required arguments diff --git a/tests/cli-tests/004-send-parent-multi-subvol/test.sh b/tests/cli-tests/004-send-parent-multi-subvol/test.sh index 72a9eb36..49226f9b 100755 --- a/tests/cli-tests/004-send-parent-multi-subvol/test.sh +++ b/tests/cli-tests/004-send-parent-multi-subvol/test.sh @@ -10,7 +10,7 @@ check_prereq btrfs setup_root_helper prepare_test_dev 2g -run_check "$TOP/mkfs.btrfs" -f "$IMAGE" +run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" run_check_mount_test_dev here=`pwd` diff --git a/tests/cli-tests/005-qgroup-show/test.sh b/tests/cli-tests/005-qgroup-show/test.sh index 46d3c3a7..2af13033 100755 --- a/tests/cli-tests/005-qgroup-show/test.sh +++ b/tests/cli-tests/005-qgroup-show/test.sh @@ -10,7 +10,7 @@ check_prereq btrfs setup_root_helper prepare_test_dev 2g -run_check "$TOP/mkfs.btrfs" -f "$IMAGE" +run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" run_check_mount_test_dev run_mayfail "$TOP/btrfs" qgroup show "$TEST_MNT" run_mayfail $SUDO_HELPER "$TOP/btrfs" qgroup show "$TEST_MNT" diff --git a/tests/cli-tests/006-qgroup-show-sync/test.sh b/tests/cli-tests/006-qgroup-show-sync/test.sh index 30d0a9a1..d552b8b9 100755 --- a/tests/cli-tests/006-qgroup-show-sync/test.sh +++ b/tests/cli-tests/006-qgroup-show-sync/test.sh @@ -10,7 +10,7 @@ check_prereq btrfs setup_root_helper prepare_test_dev 1g -run_check "$TOP/mkfs.btrfs" -f "$IMAGE" +run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" run_check_mount_test_dev run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/Sub" -- cgit v1.2.3 From a36d92cb8b52be7d9aa5c38cb42f7ebb56f289c2 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 31 Aug 2017 18:49:38 +0200 Subject: btrfs-progs: tests: add test for check --force Basic test of the --force functionality, on an empty filesystem. Signed-off-by: David Sterba --- tests/cli-tests/007-check-force/test.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 tests/cli-tests/007-check-force/test.sh (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/007-check-force/test.sh b/tests/cli-tests/007-check-force/test.sh new file mode 100755 index 00000000..ecee0166 --- /dev/null +++ b/tests/cli-tests/007-check-force/test.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# +# test 'btrfs check --force' on a mounted filesystem + +source "$TOP/tests/common" + +check_prereq mkfs.btrfs +check_prereq btrfs + +setup_root_helper +prepare_test_dev + +run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" +run_check_mount_test_dev +run_mustfail $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV" +run_check $SUDO_HELPER "$TOP/btrfs" check --force "$TEST_DEV" +run_mustfail $SUDO_HELPER "$TOP/btrfs" check --force --repair "$TEST_DEV" +run_check_umount_test_dev +run_check $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV" +run_check $SUDO_HELPER "$TOP/btrfs" check --force "$TEST_DEV" +run_mustfail $SUDO_HELPER "$TOP/btrfs" check --force --repair "$TEST_DEV" -- cgit v1.2.3 From 67b7b4bc4090e83059384b8c870ed09ab410ad5b Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 11 Sep 2017 17:29:03 +0200 Subject: btrfs-progs: tests: fix run_mustfail in cli-tests/007-check-force The sanity check in run_mustfail does not work as expected and allowed the command to continue without the missing parameter Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=196893 Signed-off-by: David Sterba --- tests/cli-tests/007-check-force/test.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/007-check-force/test.sh b/tests/cli-tests/007-check-force/test.sh index ecee0166..8b60033f 100755 --- a/tests/cli-tests/007-check-force/test.sh +++ b/tests/cli-tests/007-check-force/test.sh @@ -12,10 +12,13 @@ prepare_test_dev run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" run_check_mount_test_dev -run_mustfail $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV" +run_mustfail "checking mounted filesystem without --force" \ + $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV" run_check $SUDO_HELPER "$TOP/btrfs" check --force "$TEST_DEV" -run_mustfail $SUDO_HELPER "$TOP/btrfs" check --force --repair "$TEST_DEV" +run_mustfail "checking mounted filesystem with --force --repair" \ + $SUDO_HELPER "$TOP/btrfs" check --force --repair "$TEST_DEV" run_check_umount_test_dev run_check $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV" run_check $SUDO_HELPER "$TOP/btrfs" check --force "$TEST_DEV" -run_mustfail $SUDO_HELPER "$TOP/btrfs" check --force --repair "$TEST_DEV" +run_mustfail "--force --repair on unmounted filesystem" \ + $SUDO_HELPER "$TOP/btrfs" check --force --repair "$TEST_DEV" -- cgit v1.2.3 From a69c1917c255c453cecf8d693471324a77d8a1aa Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 10 Oct 2017 14:57:26 +0200 Subject: btrfs-progs: tests: fsck/007 fix so check --force works Signed-off-by: David Sterba --- tests/cli-tests/007-check-force/test.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/007-check-force/test.sh b/tests/cli-tests/007-check-force/test.sh index 8b60033f..12b30205 100755 --- a/tests/cli-tests/007-check-force/test.sh +++ b/tests/cli-tests/007-check-force/test.sh @@ -8,9 +8,15 @@ check_prereq mkfs.btrfs check_prereq btrfs setup_root_helper -prepare_test_dev -run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" +# we need to use a real block device, because the check opens the device in +# exclusive mode, that unfortunatelly behaves differently for direct file +# access and for the real /dev/loop0 device +setup_loopdevs 1 +prepare_loopdevs +TEST_DEV=${loopdevs[1]} + +run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV" run_check_mount_test_dev run_mustfail "checking mounted filesystem without --force" \ $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV" @@ -22,3 +28,5 @@ run_check $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV" run_check $SUDO_HELPER "$TOP/btrfs" check --force "$TEST_DEV" run_mustfail "--force --repair on unmounted filesystem" \ $SUDO_HELPER "$TOP/btrfs" check --force --repair "$TEST_DEV" + +cleanup_loopdevs -- cgit v1.2.3 From 9896b43f70df300feb792487f92b1b1ed87a49ce Mon Sep 17 00:00:00 2001 From: "Misono, Tomohiro" Date: Wed, 18 Oct 2017 11:00:43 +0900 Subject: btrfs-progs: test: add new cli-test for subvol get/set-default Add new test to check functionality of subvol get/set-default. Signed-off-by: Tomohiro Misono [ fix style issues, add missing SUDO_HELPER ] Signed-off-by: David Sterba --- .../008-subvolume-get-set-default/test.sh | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100755 tests/cli-tests/008-subvolume-get-set-default/test.sh (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/008-subvolume-get-set-default/test.sh b/tests/cli-tests/008-subvolume-get-set-default/test.sh new file mode 100755 index 00000000..9318002e --- /dev/null +++ b/tests/cli-tests/008-subvolume-get-set-default/test.sh @@ -0,0 +1,47 @@ +#!/bin/bash +# test for "subvolume get-default/set-default" + +check_default_id() +{ + 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" + fi +} + +source "$TOP/tests/common" + +check_prereq mkfs.btrfs +check_prereq btrfs + +setup_root_helper +prepare_test_dev + +run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" +run_check_mount_test_dev +cd "$TEST_MNT" + +check_default_id 5 + +# check "subvol set-default " +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" subvolume set-default 100 . + +# check "subvol set-default " +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 $SUDO_HELPER mkdir sub2/dir +run_mustfail "set-default to normal directory" \ + $SUDO_HELPER "$TOP/btrfs" subvolume set-default ./sub2/dir + +cd .. +run_check_umount_test_dev -- cgit v1.2.3 From a6e5cdef437ca9f47e70f928fa8c4338d2037ad5 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 27 Oct 2017 15:50:34 +0200 Subject: btrfs-progs: tests: don't pass size to prepare_test_dev if not necessary Most tests don't need a specific size of the test device, the default 2GiB should be fine. Signed-off-by: David Sterba --- tests/cli-tests/002-balance-full-no-filters/test.sh | 2 +- tests/cli-tests/004-send-parent-multi-subvol/test.sh | 2 +- tests/cli-tests/005-qgroup-show/test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/002-balance-full-no-filters/test.sh b/tests/cli-tests/002-balance-full-no-filters/test.sh index 0501aad2..0475ea73 100755 --- a/tests/cli-tests/002-balance-full-no-filters/test.sh +++ b/tests/cli-tests/002-balance-full-no-filters/test.sh @@ -8,7 +8,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 diff --git a/tests/cli-tests/004-send-parent-multi-subvol/test.sh b/tests/cli-tests/004-send-parent-multi-subvol/test.sh index 49226f9b..c1348b50 100755 --- a/tests/cli-tests/004-send-parent-multi-subvol/test.sh +++ b/tests/cli-tests/004-send-parent-multi-subvol/test.sh @@ -8,7 +8,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 diff --git a/tests/cli-tests/005-qgroup-show/test.sh b/tests/cli-tests/005-qgroup-show/test.sh index 2af13033..d9a91831 100755 --- a/tests/cli-tests/005-qgroup-show/test.sh +++ b/tests/cli-tests/005-qgroup-show/test.sh @@ -8,7 +8,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 -- cgit v1.2.3 From cebf3b37228cbde730a5448ad2dfb044600d5e03 Mon Sep 17 00:00:00 2001 From: Gu Jinxiang Date: Thu, 8 Feb 2018 14:34:19 +0800 Subject: btrfs-progs: introduce TEST_TOP and INTERNAL_BIN for tests Use TEST_TOP as base for tests to reference any files, this will be used for git and external testsuite. INTERNAL_BIN is needed for referencing binaries that could reside in different paths in git vs external testsuite. Signed-off-by: Gu Jinxiang [ add quotes around sourced files, update changelog ] Signed-off-by: David Sterba --- tests/cli-tests/001-btrfs/test.sh | 2 +- tests/cli-tests/002-balance-full-no-filters/test.sh | 2 +- tests/cli-tests/003-fi-resize-args/test.sh | 2 +- tests/cli-tests/004-send-parent-multi-subvol/test.sh | 2 +- tests/cli-tests/005-qgroup-show/test.sh | 2 +- tests/cli-tests/006-qgroup-show-sync/test.sh | 2 +- tests/cli-tests/007-check-force/test.sh | 2 +- tests/cli-tests/008-subvolume-get-set-default/test.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/001-btrfs/test.sh b/tests/cli-tests/001-btrfs/test.sh index c680604b..55ab0ad5 100755 --- a/tests/cli-tests/001-btrfs/test.sh +++ b/tests/cli-tests/001-btrfs/test.sh @@ -1,7 +1,7 @@ #!/bin/bash # test commands of btrfs -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs diff --git a/tests/cli-tests/002-balance-full-no-filters/test.sh b/tests/cli-tests/002-balance-full-no-filters/test.sh index 0475ea73..3403b700 100755 --- a/tests/cli-tests/002-balance-full-no-filters/test.sh +++ b/tests/cli-tests/002-balance-full-no-filters/test.sh @@ -2,7 +2,7 @@ # # coverage of balance --full-balance -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq mkfs.btrfs check_prereq btrfs diff --git a/tests/cli-tests/003-fi-resize-args/test.sh b/tests/cli-tests/003-fi-resize-args/test.sh index e4f262b6..f6f598f2 100755 --- a/tests/cli-tests/003-fi-resize-args/test.sh +++ b/tests/cli-tests/003-fi-resize-args/test.sh @@ -2,7 +2,7 @@ # # test parsing of various resize arguments -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq mkfs.btrfs check_prereq btrfs diff --git a/tests/cli-tests/004-send-parent-multi-subvol/test.sh b/tests/cli-tests/004-send-parent-multi-subvol/test.sh index c1348b50..165ef4a6 100755 --- a/tests/cli-tests/004-send-parent-multi-subvol/test.sh +++ b/tests/cli-tests/004-send-parent-multi-subvol/test.sh @@ -2,7 +2,7 @@ # # minimal test for the following syntax: btrfs send -p parent subvol1 subvol2 -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq mkfs.btrfs check_prereq btrfs diff --git a/tests/cli-tests/005-qgroup-show/test.sh b/tests/cli-tests/005-qgroup-show/test.sh index d9a91831..10521039 100755 --- a/tests/cli-tests/005-qgroup-show/test.sh +++ b/tests/cli-tests/005-qgroup-show/test.sh @@ -2,7 +2,7 @@ # # qgroup show behaviour when quotas are not enabled -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq mkfs.btrfs check_prereq btrfs diff --git a/tests/cli-tests/006-qgroup-show-sync/test.sh b/tests/cli-tests/006-qgroup-show-sync/test.sh index d552b8b9..aec7a4ba 100755 --- a/tests/cli-tests/006-qgroup-show-sync/test.sh +++ b/tests/cli-tests/006-qgroup-show-sync/test.sh @@ -2,7 +2,7 @@ # # simple test of qgroup show --sync option -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq mkfs.btrfs check_prereq btrfs diff --git a/tests/cli-tests/007-check-force/test.sh b/tests/cli-tests/007-check-force/test.sh index 12b30205..597f2d60 100755 --- a/tests/cli-tests/007-check-force/test.sh +++ b/tests/cli-tests/007-check-force/test.sh @@ -2,7 +2,7 @@ # # test 'btrfs check --force' on a mounted filesystem -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq mkfs.btrfs check_prereq btrfs diff --git a/tests/cli-tests/008-subvolume-get-set-default/test.sh b/tests/cli-tests/008-subvolume-get-set-default/test.sh index 9318002e..706ee8c5 100755 --- a/tests/cli-tests/008-subvolume-get-set-default/test.sh +++ b/tests/cli-tests/008-subvolume-get-set-default/test.sh @@ -10,7 +10,7 @@ check_default_id() fi } -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq mkfs.btrfs check_prereq btrfs -- cgit v1.2.3 From 0509c05ae6bd7461964d3e483246aa07a63ee6d0 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Mon, 26 Nov 2018 17:53:43 +0100 Subject: btrfs-progs: tests: fix typos in test comments Generated by https://github.com/jsoref/spelling Issue: #154 Author: Josh Soref Signed-off-by: David Sterba --- tests/cli-tests/007-check-force/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/cli-tests') diff --git a/tests/cli-tests/007-check-force/test.sh b/tests/cli-tests/007-check-force/test.sh index 597f2d60..deee96c8 100755 --- a/tests/cli-tests/007-check-force/test.sh +++ b/tests/cli-tests/007-check-force/test.sh @@ -10,7 +10,7 @@ check_prereq btrfs setup_root_helper # we need to use a real block device, because the check opens the device in -# exclusive mode, that unfortunatelly behaves differently for direct file +# exclusive mode, that unfortunately behaves differently for direct file # access and for the real /dev/loop0 device setup_loopdevs 1 prepare_loopdevs -- cgit v1.2.3