| Message ID | 20171012072858.19005-2-quwenruo.btrfs@gmx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Oct 12, 2017 at 12:28:58AM -0700, Qu Wenruo wrote: >New test case to test if the minimal device size given by "mkfs.btrfs" >failure case is valid. > >Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> >--- > tests/common | 57 +++++++++++++++++++++++++++++++- > tests/mkfs-tests/010-small-image/test.sh | 51 ++++++++++++++++++++++++++++ > 2 files changed, 107 insertions(+), 1 deletion(-) > create mode 100755 tests/mkfs-tests/010-small-image/test.sh > >diff --git a/tests/common b/tests/common >index eb525a4d02c5..e026cc2f4d30 100644 >--- a/tests/common >+++ b/tests/common >@@ -236,6 +236,57 @@ run_mustfail() > fi > } > >+run_mustfail_stdout() >+{ >+ local spec >+ local ins >+ local cmd >+ local msg >+ local ret >+ >+ # We don't use pipefail to avoid disturbing other script, so here we >+ # use temporary output file. >+ # So it doesn't support pipeline in the @cmd >+ local tmp_output >+ >+ tmp_output=$(mktemp --tmpdir btrfs-progs-test--mustfail-stdtout.XXXXXX) >+ >+ msg="$1" >+ shift >+ >+ if _is_file_or_command "$msg"; then >+ echo "ASSERTION FAIL: 1st argument of run_mustfail_stdout must be a message" >+ exit 1 >+ fi >+ >+ ins=$(_get_spec_ins "$@") >+ spec=$(($ins-1)) >+ cmd=$(eval echo "\${$spec}") >+ spec=$(_cmd_spec "${@:$spec}") >+ set -- "${@:1:$(($ins-1))}" $spec "${@: $ins}" >+ echo "############### $@" >> "$RESULTS" 2>&1 >+ if [[ $TEST_LOG =~ tty ]]; then echo "CMD(mustfail): $@" > /dev/tty; fi >+ if [ "$1" = 'root_helper' ]; then >+ "$@" 2>&1 > "$tmp_output" >+ else >+ $INSTRUMENT "$@" 2>&1 > "$tmp_output" >+ fi >+ ret=$? >+ >+ cat "$tmp_output" >> "$RESULTS" >+ cat "$tmp_output" >+ rm "$tmp_output" >+ >+ if [ "$ret" != 0 ]; then >+ echo "failed (expected): $@" >> "$RESULTS" >+ return 0 >+ else >+ echo "succeeded (unexpected!): $@" >> "$RESULTS" >+ _fail "unexpected success: $msg" >+ return 1 >+ fi >+} >+ > check_prereq() > { > if ! [ -f "$TOP/$1" ]; then >@@ -389,7 +440,11 @@ prepare_test_dev() > # num[K/M/G/T...] > local size="$1" > >- [[ "$TEST_DEV" ]] && return >+ # Still truncate it to new size >+ if [[ "$TEST_DEV" ]]; then >+ truncate -s "$size" "$TEST_DEV" >+ return; >+ fi > [[ "$size" ]] || size='2G' > > echo "\$TEST_DEV not given, use $TOP/test/test.img as fallback" >> \ >diff --git a/tests/mkfs-tests/010-small-image/test.sh b/tests/mkfs-tests/010-small-image/test.sh >new file mode 100755 >index 000000000000..f12c9c836bd6 >--- /dev/null >+++ b/tests/mkfs-tests/010-small-image/test.sh >@@ -0,0 +1,51 @@ >+#!/bin/bash >+# test if the reported minimal size of mkfs.btrfs is valid >+ >+source $TOP/tests/common >+ >+check_prereq mkfs.btrfs >+check_prereq btrfs >+ >+setup_root_helper >+ >+pagesize=$(getconf PAGESIZE) >+ >+do_test() >+{ >+ # Well, 1M small enough to fail, we just use the output >+ # to get the minimal device size >+ prepare_test_dev 1M >+ output=$(run_mustfail_stdout "mkfs.btrfs for small image" \ >+ $TOP/mkfs.btrfs -f $@ "$TEST_DEV") >+ good_size=$(echo $output | grep -o "[[:digit:]]\{3,\}") I applied these patches on kdave/devel, and found a small problem when run mkfs-tests/010-small-image. # fallocate -l 1M a.img # ./mkfs.btrfs a.img btrfs-progs v4.13.2-34-ga8dc557a See http://btrfs.wiki.kernel.org for more information. ERROR: 'a.img' is too small to make a usable filesystem ERROR: minimum size for each btrfs device is 113246208 "[[:digit:]]\{3,\}" will not only match 113246208, but will match 557. So I suggest using the following regex here. It will only match the number after "is ". good_size=$(echo $output | grep -oP "(?<=is )\d+") >+ >+ prepare_test_dev "$good_size" >+ run_check $TOP/mkfs.btrfs -f $@ "$TEST_DEV" >+ run_check $SUDO_HELPER mount $TEST_DEV $TEST_MNT >+ run_check $SUDO_HELPER umount $TEST_MNT >+} >+ >+do_test -n 4k -m single -d single >+do_test -n 4k -m single -d dup >+do_test -n 4k -m dup -d single >+do_test -n 4k -m dup -d dup >+ >+do_test -n 8k -m single -d single >+do_test -n 8k -m single -d dup >+do_test -n 8k -m dup -d single >+do_test -n 8k -m dup -d dup >+ >+do_test -n 16k -m single -d single >+do_test -n 16k -m single -d dup >+do_test -n 16k -m dup -d single >+do_test -n 16k -m dup -d dup >+ >+do_test -n 32k -m single -d single >+do_test -n 32k -m single -d dup >+do_test -n 32k -m dup -d single >+do_test -n 32k -m dup -d dup >+ >+do_test -n 64k -m single -d single >+do_test -n 64k -m single -d dup >+do_test -n 64k -m dup -d single >+do_test -n 64k -m dup -d dup >-- >2.14.2 > >-- >To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in >the body of a message to majordomo@vger.kernel.org >More majordomo info at http://vger.kernel.org/majordomo-info.html > >
On 2017年10月12日 16:24, Lu Fengqi wrote: > On Thu, Oct 12, 2017 at 12:28:58AM -0700, Qu Wenruo wrote: >> New test case to test if the minimal device size given by "mkfs.btrfs" >> failure case is valid. >> >> Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> >> --- >> tests/common | 57 +++++++++++++++++++++++++++++++- >> tests/mkfs-tests/010-small-image/test.sh | 51 ++++++++++++++++++++++++++++ >> 2 files changed, 107 insertions(+), 1 deletion(-) >> create mode 100755 tests/mkfs-tests/010-small-image/test.sh >> >> diff --git a/tests/common b/tests/common >> index eb525a4d02c5..e026cc2f4d30 100644 >> --- a/tests/common >> +++ b/tests/common >> @@ -236,6 +236,57 @@ run_mustfail() >> fi >> } >> >> +run_mustfail_stdout() >> +{ >> + local spec >> + local ins >> + local cmd >> + local msg >> + local ret >> + >> + # We don't use pipefail to avoid disturbing other script, so here we >> + # use temporary output file. >> + # So it doesn't support pipeline in the @cmd >> + local tmp_output >> + >> + tmp_output=$(mktemp --tmpdir btrfs-progs-test--mustfail-stdtout.XXXXXX) >> + >> + msg="$1" >> + shift >> + >> + if _is_file_or_command "$msg"; then >> + echo "ASSERTION FAIL: 1st argument of run_mustfail_stdout must be a message" >> + exit 1 >> + fi >> + >> + ins=$(_get_spec_ins "$@") >> + spec=$(($ins-1)) >> + cmd=$(eval echo "\${$spec}") >> + spec=$(_cmd_spec "${@:$spec}") >> + set -- "${@:1:$(($ins-1))}" $spec "${@: $ins}" >> + echo "############### $@" >> "$RESULTS" 2>&1 >> + if [[ $TEST_LOG =~ tty ]]; then echo "CMD(mustfail): $@" > /dev/tty; fi >> + if [ "$1" = 'root_helper' ]; then >> + "$@" 2>&1 > "$tmp_output" >> + else >> + $INSTRUMENT "$@" 2>&1 > "$tmp_output" >> + fi >> + ret=$? >> + >> + cat "$tmp_output" >> "$RESULTS" >> + cat "$tmp_output" >> + rm "$tmp_output" >> + >> + if [ "$ret" != 0 ]; then >> + echo "failed (expected): $@" >> "$RESULTS" >> + return 0 >> + else >> + echo "succeeded (unexpected!): $@" >> "$RESULTS" >> + _fail "unexpected success: $msg" >> + return 1 >> + fi >> +} >> + >> check_prereq() >> { >> if ! [ -f "$TOP/$1" ]; then >> @@ -389,7 +440,11 @@ prepare_test_dev() >> # num[K/M/G/T...] >> local size="$1" >> >> - [[ "$TEST_DEV" ]] && return >> + # Still truncate it to new size >> + if [[ "$TEST_DEV" ]]; then >> + truncate -s "$size" "$TEST_DEV" >> + return; >> + fi >> [[ "$size" ]] || size='2G' >> >> echo "\$TEST_DEV not given, use $TOP/test/test.img as fallback" >> \ >> diff --git a/tests/mkfs-tests/010-small-image/test.sh b/tests/mkfs-tests/010-small-image/test.sh >> new file mode 100755 >> index 000000000000..f12c9c836bd6 >> --- /dev/null >> +++ b/tests/mkfs-tests/010-small-image/test.sh >> @@ -0,0 +1,51 @@ >> +#!/bin/bash >> +# test if the reported minimal size of mkfs.btrfs is valid >> + >> +source $TOP/tests/common >> + >> +check_prereq mkfs.btrfs >> +check_prereq btrfs >> + >> +setup_root_helper >> + >> +pagesize=$(getconf PAGESIZE) >> + >> +do_test() >> +{ >> + # Well, 1M small enough to fail, we just use the output >> + # to get the minimal device size >> + prepare_test_dev 1M >> + output=$(run_mustfail_stdout "mkfs.btrfs for small image" \ >> + $TOP/mkfs.btrfs -f $@ "$TEST_DEV") >> + good_size=$(echo $output | grep -o "[[:digit:]]\{3,\}") > > I applied these patches on kdave/devel, and found a small problem when run > mkfs-tests/010-small-image. > > # fallocate -l 1M a.img > # ./mkfs.btrfs a.img > btrfs-progs v4.13.2-34-ga8dc557a > See http://btrfs.wiki.kernel.org for more information. > > ERROR: 'a.img' is too small to make a usable filesystem > ERROR: minimum size for each btrfs device is 113246208 > > "[[:digit:]]\{3,\}" will not only match 113246208, but will match 557. > > So I suggest using the following regex here. It will only match the > number after "is ". > > good_size=$(echo $output | grep -oP "(?<=is )\d+") Yes, this is much better. I just forget that in version string we can have digits. I'll update the test case. Thanks, Qu > >> + >> + prepare_test_dev "$good_size" >> + run_check $TOP/mkfs.btrfs -f $@ "$TEST_DEV" >> + run_check $SUDO_HELPER mount $TEST_DEV $TEST_MNT >> + run_check $SUDO_HELPER umount $TEST_MNT >> +} >> + >> +do_test -n 4k -m single -d single >> +do_test -n 4k -m single -d dup >> +do_test -n 4k -m dup -d single >> +do_test -n 4k -m dup -d dup >> + >> +do_test -n 8k -m single -d single >> +do_test -n 8k -m single -d dup >> +do_test -n 8k -m dup -d single >> +do_test -n 8k -m dup -d dup >> + >> +do_test -n 16k -m single -d single >> +do_test -n 16k -m single -d dup >> +do_test -n 16k -m dup -d single >> +do_test -n 16k -m dup -d dup >> + >> +do_test -n 32k -m single -d single >> +do_test -n 32k -m single -d dup >> +do_test -n 32k -m dup -d single >> +do_test -n 32k -m dup -d dup >> + >> +do_test -n 64k -m single -d single >> +do_test -n 64k -m single -d dup >> +do_test -n 64k -m dup -d single >> +do_test -n 64k -m dup -d dup >> -- >> 2.14.2 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> >> > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/tests/common b/tests/common index eb525a4d02c5..e026cc2f4d30 100644 --- a/tests/common +++ b/tests/common @@ -236,6 +236,57 @@ run_mustfail() fi } +run_mustfail_stdout() +{ + local spec + local ins + local cmd + local msg + local ret + + # We don't use pipefail to avoid disturbing other script, so here we + # use temporary output file. + # So it doesn't support pipeline in the @cmd + local tmp_output + + tmp_output=$(mktemp --tmpdir btrfs-progs-test--mustfail-stdtout.XXXXXX) + + msg="$1" + shift + + if _is_file_or_command "$msg"; then + echo "ASSERTION FAIL: 1st argument of run_mustfail_stdout must be a message" + exit 1 + fi + + ins=$(_get_spec_ins "$@") + spec=$(($ins-1)) + cmd=$(eval echo "\${$spec}") + spec=$(_cmd_spec "${@:$spec}") + set -- "${@:1:$(($ins-1))}" $spec "${@: $ins}" + echo "############### $@" >> "$RESULTS" 2>&1 + if [[ $TEST_LOG =~ tty ]]; then echo "CMD(mustfail): $@" > /dev/tty; fi + if [ "$1" = 'root_helper' ]; then + "$@" 2>&1 > "$tmp_output" + else + $INSTRUMENT "$@" 2>&1 > "$tmp_output" + fi + ret=$? + + cat "$tmp_output" >> "$RESULTS" + cat "$tmp_output" + rm "$tmp_output" + + if [ "$ret" != 0 ]; then + echo "failed (expected): $@" >> "$RESULTS" + return 0 + else + echo "succeeded (unexpected!): $@" >> "$RESULTS" + _fail "unexpected success: $msg" + return 1 + fi +} + check_prereq() { if ! [ -f "$TOP/$1" ]; then @@ -389,7 +440,11 @@ prepare_test_dev() # num[K/M/G/T...] local size="$1" - [[ "$TEST_DEV" ]] && return + # Still truncate it to new size + if [[ "$TEST_DEV" ]]; then + truncate -s "$size" "$TEST_DEV" + return; + fi [[ "$size" ]] || size='2G' echo "\$TEST_DEV not given, use $TOP/test/test.img as fallback" >> \ diff --git a/tests/mkfs-tests/010-small-image/test.sh b/tests/mkfs-tests/010-small-image/test.sh new file mode 100755 index 000000000000..f12c9c836bd6 --- /dev/null +++ b/tests/mkfs-tests/010-small-image/test.sh @@ -0,0 +1,51 @@ +#!/bin/bash +# test if the reported minimal size of mkfs.btrfs is valid + +source $TOP/tests/common + +check_prereq mkfs.btrfs +check_prereq btrfs + +setup_root_helper + +pagesize=$(getconf PAGESIZE) + +do_test() +{ + # Well, 1M small enough to fail, we just use the output + # to get the minimal device size + prepare_test_dev 1M + output=$(run_mustfail_stdout "mkfs.btrfs for small image" \ + $TOP/mkfs.btrfs -f $@ "$TEST_DEV") + good_size=$(echo $output | grep -o "[[:digit:]]\{3,\}") + + prepare_test_dev "$good_size" + run_check $TOP/mkfs.btrfs -f $@ "$TEST_DEV" + run_check $SUDO_HELPER mount $TEST_DEV $TEST_MNT + run_check $SUDO_HELPER umount $TEST_MNT +} + +do_test -n 4k -m single -d single +do_test -n 4k -m single -d dup +do_test -n 4k -m dup -d single +do_test -n 4k -m dup -d dup + +do_test -n 8k -m single -d single +do_test -n 8k -m single -d dup +do_test -n 8k -m dup -d single +do_test -n 8k -m dup -d dup + +do_test -n 16k -m single -d single +do_test -n 16k -m single -d dup +do_test -n 16k -m dup -d single +do_test -n 16k -m dup -d dup + +do_test -n 32k -m single -d single +do_test -n 32k -m single -d dup +do_test -n 32k -m dup -d single +do_test -n 32k -m dup -d dup + +do_test -n 64k -m single -d single +do_test -n 64k -m single -d dup +do_test -n 64k -m dup -d single +do_test -n 64k -m dup -d dup
New test case to test if the minimal device size given by "mkfs.btrfs" failure case is valid. Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> --- tests/common | 57 +++++++++++++++++++++++++++++++- tests/mkfs-tests/010-small-image/test.sh | 51 ++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 1 deletion(-) create mode 100755 tests/mkfs-tests/010-small-image/test.sh