| Message ID | 20170803150301.10177-6-kwolf@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/03/2017 10:03 AM, Kevin Wolf wrote: > This serves as a regression test for the bugs that were just fixed for > bdrv_reopen() between read-only and read-write mode. If I'm right that this also fixes the difference between intermediate vs. live commit to an initial read-write image that can't be reopened, can we add that to this test? > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > tests/qemu-iotests/187 | 69 ++++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/187.out | 18 ++++++++++++ > tests/qemu-iotests/group | 1 + > 3 files changed, 88 insertions(+) > create mode 100755 tests/qemu-iotests/187 > create mode 100644 tests/qemu-iotests/187.out > > + > +_cleanup() > +{ > + _cleanup_test_img > + rm -f "$TEST_IMG.2" > + rm -f "$TEST_IMG.3" > +} > +trap "_cleanup; exit \$status" 0 1 2 3 15 There are pending patches for 2.11 that will need to tweak this. But for 2.10, this is fine. > +++ b/tests/qemu-iotests/187.out > @@ -0,0 +1,18 @@ > +QA output created by 187 > +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 > + > +Start from read-only > + > +Block node is read-only > +wrote 65536/65536 bytes at offset 0 > +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +Block node is read-only > + Why the difference in error messages, when starting read-only, > +Start from read-write > + > +wrote 65536/65536 bytes at offset 0 > +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +write failed: Operation not permitted vs. when reopened read-only? I don't see it as a flaw in the test, so much as another odd difference in code paths that we may later want to improve. So, as written, Reviewed-by: Eric Blake <eblake@redhat.com>
On Thu, Aug 03, 2017 at 05:03:01PM +0200, Kevin Wolf wrote: > This serves as a regression test for the bugs that were just fixed for > bdrv_reopen() between read-only and read-write mode. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > tests/qemu-iotests/187 | 69 ++++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/187.out | 18 ++++++++++++ > tests/qemu-iotests/group | 1 + > 3 files changed, 88 insertions(+) > create mode 100755 tests/qemu-iotests/187 > create mode 100644 tests/qemu-iotests/187.out > > diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187 > new file mode 100755 > index 0000000000..7bb783363c > --- /dev/null > +++ b/tests/qemu-iotests/187 > @@ -0,0 +1,69 @@ > +#!/bin/bash > +# > +# Test switching between read-only and read-write > +# > +# Copyright (C) 2017 Red Hat, Inc. > +# > +# This program is free software; you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation; either version 2 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program. If not, see <http://www.gnu.org/licenses/>. > +# > + > +# creator > +owner=kwolf@redhat.com > + > +seq=`basename $0` > +echo "QA output created by $seq" > + > +here=`pwd` > +status=1 # failure is the default! > + > +_cleanup() > +{ > + _cleanup_test_img > + rm -f "$TEST_IMG.2" > + rm -f "$TEST_IMG.3" > +} > +trap "_cleanup; exit \$status" 0 1 2 3 15 > + As Eric noted, I'll need to make sure to add this to my series to strip out the cleanup. Reviewed-by: Jeff Cody <jcody@redhat.com> > +# get standard environment, filters and checks > +. ./common.rc > +. ./common.filter > + > +_supported_fmt qcow2 > +_supported_proto file > +_supported_os Linux > + > +size=64M > +_make_test_img $size > + > +echo > +echo "Start from read-only" > +echo > + > +$QEMU_IO -r -c 'write 0 64k' $TEST_IMG | _filter_qemu_io > +$QEMU_IO -r -c 'reopen -w' -c 'write 0 64k' $TEST_IMG | _filter_qemu_io > +$QEMU_IO -r -c 'reopen -w' -c 'reopen -r' -c 'write 0 64k' $TEST_IMG | _filter_qemu_io > + > +echo > +echo "Start from read-write" > +echo > + > +$QEMU_IO -c 'write 0 64k' $TEST_IMG | _filter_qemu_io > +$QEMU_IO -c 'reopen -r' -c 'write 0 64k' $TEST_IMG | _filter_qemu_io > +$QEMU_IO -c 'reopen -r' -c 'reopen -w' -c 'write 0 64k' $TEST_IMG | _filter_qemu_io > + > + > +# success, all done > +echo "*** done" > +rm -f $seq.full > +status=0 > diff --git a/tests/qemu-iotests/187.out b/tests/qemu-iotests/187.out > new file mode 100644 > index 0000000000..68fb944cd5 > --- /dev/null > +++ b/tests/qemu-iotests/187.out > @@ -0,0 +1,18 @@ > +QA output created by 187 > +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 > + > +Start from read-only > + > +Block node is read-only > +wrote 65536/65536 bytes at offset 0 > +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +Block node is read-only > + > +Start from read-write > + > +wrote 65536/65536 bytes at offset 0 > +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +write failed: Operation not permitted > +wrote 65536/65536 bytes at offset 0 > +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +*** done > diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group > index 823811076d..1848077932 100644 > --- a/tests/qemu-iotests/group > +++ b/tests/qemu-iotests/group > @@ -182,6 +182,7 @@ > 183 rw auto migration > 185 rw auto > 186 rw auto > +187 rw auto > 188 rw auto quick > 189 rw auto > 190 rw auto quick > -- > 2.13.3 > >
diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187 new file mode 100755 index 0000000000..7bb783363c --- /dev/null +++ b/tests/qemu-iotests/187 @@ -0,0 +1,69 @@ +#!/bin/bash +# +# Test switching between read-only and read-write +# +# Copyright (C) 2017 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +# creator +owner=kwolf@redhat.com + +seq=`basename $0` +echo "QA output created by $seq" + +here=`pwd` +status=1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img + rm -f "$TEST_IMG.2" + rm -f "$TEST_IMG.3" +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter + +_supported_fmt qcow2 +_supported_proto file +_supported_os Linux + +size=64M +_make_test_img $size + +echo +echo "Start from read-only" +echo + +$QEMU_IO -r -c 'write 0 64k' $TEST_IMG | _filter_qemu_io +$QEMU_IO -r -c 'reopen -w' -c 'write 0 64k' $TEST_IMG | _filter_qemu_io +$QEMU_IO -r -c 'reopen -w' -c 'reopen -r' -c 'write 0 64k' $TEST_IMG | _filter_qemu_io + +echo +echo "Start from read-write" +echo + +$QEMU_IO -c 'write 0 64k' $TEST_IMG | _filter_qemu_io +$QEMU_IO -c 'reopen -r' -c 'write 0 64k' $TEST_IMG | _filter_qemu_io +$QEMU_IO -c 'reopen -r' -c 'reopen -w' -c 'write 0 64k' $TEST_IMG | _filter_qemu_io + + +# success, all done +echo "*** done" +rm -f $seq.full +status=0 diff --git a/tests/qemu-iotests/187.out b/tests/qemu-iotests/187.out new file mode 100644 index 0000000000..68fb944cd5 --- /dev/null +++ b/tests/qemu-iotests/187.out @@ -0,0 +1,18 @@ +QA output created by 187 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 + +Start from read-only + +Block node is read-only +wrote 65536/65536 bytes at offset 0 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Block node is read-only + +Start from read-write + +wrote 65536/65536 bytes at offset 0 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +write failed: Operation not permitted +wrote 65536/65536 bytes at offset 0 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 823811076d..1848077932 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -182,6 +182,7 @@ 183 rw auto migration 185 rw auto 186 rw auto +187 rw auto 188 rw auto quick 189 rw auto 190 rw auto quick
This serves as a regression test for the bugs that were just fixed for bdrv_reopen() between read-only and read-write mode. Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- tests/qemu-iotests/187 | 69 ++++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/187.out | 18 ++++++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 88 insertions(+) create mode 100755 tests/qemu-iotests/187 create mode 100644 tests/qemu-iotests/187.out