| Message ID | 1425413591-31413-4-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, 03/03 15:13, Max Reitz wrote: > This patch adds a test for ejecting the BlockBackend an NBD server is > connected to (the NBD server is supposed to stop). > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/096 | 90 ++++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/096.out | 16 +++++++++ > tests/qemu-iotests/group | 1 + > 3 files changed, 107 insertions(+) > create mode 100755 tests/qemu-iotests/096 > create mode 100644 tests/qemu-iotests/096.out > > diff --git a/tests/qemu-iotests/096 b/tests/qemu-iotests/096 > new file mode 100755 > index 0000000..bcba0ec > --- /dev/null > +++ b/tests/qemu-iotests/096 > @@ -0,0 +1,90 @@ > +#!/bin/bash > +# > +# Test case for ejecting a BB with an NBD server attached to it > +# > +# Copyright (C) 2015 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=mreitz@redhat.com > + > +seq="$(basename $0)" > +echo "QA output created by $seq" > + > +here="$PWD" > +tmp=/tmp/$$ > +status=1 # failure is the default! > + > +_cleanup() > +{ > + _cleanup_test_img > +} > +trap "_cleanup; exit \$status" 0 1 2 3 15 > + > +# get standard environment, filters and checks > +. ./common.rc > +. ./common.filter > +. ./common.qemu > + > +_supported_fmt generic > +_supported_proto file > +_supported_os Linux > + > +_make_test_img 64k > + > +$QEMU_IO -c 'write -P 42 0 64k' "$TEST_IMG" | _filter_qemu_io > + > +keep_stderr=y \ > +_launch_qemu -drive if=ide,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ > + 2> >(_filter_nbd) > + > +_send_qemu_cmd $QEMU_HANDLE \ > + "{ 'execute': 'qmp_capabilities' }" \ > + 'return' > + > +_send_qemu_cmd $QEMU_HANDLE \ > + "{ 'execute': 'nbd-server-start', > + 'arguments': { 'addr': { 'type': 'inet', > + 'data': { 'host': '127.0.0.1', > + 'port': '10809' }}}}" \ Why not nbd+unix? The port could be unavailable. Fam
On 2015-03-04 at 01:30, Fam Zheng wrote: > On Tue, 03/03 15:13, Max Reitz wrote: >> This patch adds a test for ejecting the BlockBackend an NBD server is >> connected to (the NBD server is supposed to stop). >> >> Signed-off-by: Max Reitz <mreitz@redhat.com> >> --- >> tests/qemu-iotests/096 | 90 ++++++++++++++++++++++++++++++++++++++++++++++ >> tests/qemu-iotests/096.out | 16 +++++++++ >> tests/qemu-iotests/group | 1 + >> 3 files changed, 107 insertions(+) >> create mode 100755 tests/qemu-iotests/096 >> create mode 100644 tests/qemu-iotests/096.out >> >> diff --git a/tests/qemu-iotests/096 b/tests/qemu-iotests/096 >> new file mode 100755 >> index 0000000..bcba0ec >> --- /dev/null >> +++ b/tests/qemu-iotests/096 >> @@ -0,0 +1,90 @@ >> +#!/bin/bash >> +# >> +# Test case for ejecting a BB with an NBD server attached to it >> +# >> +# Copyright (C) 2015 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=mreitz@redhat.com >> + >> +seq="$(basename $0)" >> +echo "QA output created by $seq" >> + >> +here="$PWD" >> +tmp=/tmp/$$ >> +status=1 # failure is the default! >> + >> +_cleanup() >> +{ >> + _cleanup_test_img >> +} >> +trap "_cleanup; exit \$status" 0 1 2 3 15 >> + >> +# get standard environment, filters and checks >> +. ./common.rc >> +. ./common.filter >> +. ./common.qemu >> + >> +_supported_fmt generic >> +_supported_proto file >> +_supported_os Linux >> + >> +_make_test_img 64k >> + >> +$QEMU_IO -c 'write -P 42 0 64k' "$TEST_IMG" | _filter_qemu_io >> + >> +keep_stderr=y \ >> +_launch_qemu -drive if=ide,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ >> + 2> >(_filter_nbd) >> + >> +_send_qemu_cmd $QEMU_HANDLE \ >> + "{ 'execute': 'qmp_capabilities' }" \ >> + 'return' >> + >> +_send_qemu_cmd $QEMU_HANDLE \ >> + "{ 'execute': 'nbd-server-start', >> + 'arguments': { 'addr': { 'type': 'inet', >> + 'data': { 'host': '127.0.0.1', >> + 'port': '10809' }}}}" \ > Why not nbd+unix? The port could be unavailable. Running the iotests for NBD does use TCP/IP itself, so I assumed we'd just presume that port is available when running them. However, people may not expect this to happen if they don't run the tests for NBD (this is a file-specific test after all), so nbd+unix seems like a very good alternative (maybe we should do that even for the "real" NBD tests...?), so I'll (probably) use that in v6. Thanks! Max
diff --git a/tests/qemu-iotests/096 b/tests/qemu-iotests/096 new file mode 100755 index 0000000..bcba0ec --- /dev/null +++ b/tests/qemu-iotests/096 @@ -0,0 +1,90 @@ +#!/bin/bash +# +# Test case for ejecting a BB with an NBD server attached to it +# +# Copyright (C) 2015 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=mreitz@redhat.com + +seq="$(basename $0)" +echo "QA output created by $seq" + +here="$PWD" +tmp=/tmp/$$ +status=1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter +. ./common.qemu + +_supported_fmt generic +_supported_proto file +_supported_os Linux + +_make_test_img 64k + +$QEMU_IO -c 'write -P 42 0 64k' "$TEST_IMG" | _filter_qemu_io + +keep_stderr=y \ +_launch_qemu -drive if=ide,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ + 2> >(_filter_nbd) + +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' + +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'nbd-server-start', + 'arguments': { 'addr': { 'type': 'inet', + 'data': { 'host': '127.0.0.1', + 'port': '10809' }}}}" \ + 'return' + +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'nbd-server-add', + 'arguments': { 'device': 'drv' }}" \ + 'return' + +$QEMU_IO_PROG -f raw -c 'read -P 42 0 64k' 'nbd://127.0.0.1:10809/drv' 2>&1 \ + | _filter_qemu_io | _filter_nbd + +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'eject', + 'arguments': { 'device': 'drv' }}" \ + 'return' + +$QEMU_IO_PROG -f raw -c close 'nbd://127.0.0.1:10809/drv' 2>&1 \ + | _filter_qemu_io | _filter_nbd + +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'quit' }" \ + 'return' + +wait=1 _cleanup_qemu + +# success, all done +echo '*** done' +rm -f $seq.full +status=0 diff --git a/tests/qemu-iotests/096.out b/tests/qemu-iotests/096.out new file mode 100644 index 0000000..cc10e51 --- /dev/null +++ b/tests/qemu-iotests/096.out @@ -0,0 +1,16 @@ +QA output created by 096 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=65536 +wrote 65536/65536 bytes at offset 0 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +{"return": {}} +{"return": {}} +{"return": {}} +read 65536/65536 bytes at offset 0 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "drv", "tray-open": true}} +{"return": {}} +qemu-io: can't open device nbd://127.0.0.1:PORT/drv: Failed to read export length +no file open, try 'help open' +{"return": {}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"} +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index b24502b..8da0e7f 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -102,6 +102,7 @@ 093 auto 094 rw auto quick 095 rw auto quick +096 rw auto quick 097 rw auto backing 098 rw auto backing quick 099 rw auto quick
This patch adds a test for ejecting the BlockBackend an NBD server is connected to (the NBD server is supposed to stop). Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/096 | 90 ++++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/096.out | 16 +++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 107 insertions(+) create mode 100755 tests/qemu-iotests/096 create mode 100644 tests/qemu-iotests/096.out