From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PULL v2 17/50] iotests: Add test for eject under NBD server
Date: Tue, 2 Feb 2016 18:35:10 +0100 [thread overview]
Message-ID: <1454434543-25963-18-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1454434543-25963-1-git-send-email-mreitz@redhat.com>
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>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/140 | 92 ++++++++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/140.out | 16 ++++++++
tests/qemu-iotests/group | 1 +
3 files changed, 109 insertions(+)
create mode 100755 tests/qemu-iotests/140
create mode 100644 tests/qemu-iotests/140.out
diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140
new file mode 100755
index 0000000..f78c317
--- /dev/null
+++ b/tests/qemu-iotests/140
@@ -0,0 +1,92 @@
+#!/bin/bash
+#
+# Test case for ejecting a BB with an NBD server attached to it
+#
+# Copyright (C) 2016 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
+ rm -f "$TEST_DIR/nbd"
+}
+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': 'unix',
+ 'data': { 'path': '$TEST_DIR/nbd' }}}}" \
+ '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+unix:///drv?socket=$TEST_DIR/nbd" 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+unix:///drv?socket=$TEST_DIR/nbd" 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/140.out b/tests/qemu-iotests/140.out
new file mode 100644
index 0000000..fdedeb3
--- /dev/null
+++ b/tests/qemu-iotests/140.out
@@ -0,0 +1,16 @@
+QA output created by 140
+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": {}}
+can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: 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 ac6a959..ff1ff0d 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -141,5 +141,6 @@
137 rw auto
138 rw auto quick
139 rw auto quick
+140 rw auto quick
142 auto
143 auto quick
--
2.7.0
next prev parent reply other threads:[~2016-02-02 17:36 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-02 17:34 [Qemu-devel] [PULL v2 00/50] Block patches Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 01/50] block: Add blk_dev_has_tray() Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 02/50] blockdev: Fix 'change' for slot devices Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 03/50] Revert "hw/block/fdc: Implement tray status" Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 04/50] block/qapi: Emit tray_open only if there is a tray Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 05/50] vmdk: Fix converting to streamOptimized Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 06/50] iotests: Limit supported formats for 118 Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 07/50] nbd: client_close on error in nbd_co_client_start Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 08/50] iotests: Rename filter_nbd to _filter_nbd in 083 Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 09/50] iotests: Change coding style of " Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 10/50] iotests: Move _filter_nbd into common.filter Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 11/50] iotests: Make _filter_nbd drop log lines Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 12/50] iotests: Make _filter_nbd support more URL types Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 13/50] iotests: Make redirecting qemu's stderr optional Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 14/50] iotests: Add test for a nonexistent NBD export Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 15/50] block: Remove unused struct definition BlockFinishData Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 16/50] block: Release named dirty bitmaps in bdrv_close() Max Reitz
2016-02-02 17:35 ` Max Reitz [this message]
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 18/50] block: Add BB-BDS remove/insert notifiers Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 19/50] virtio-blk: Functions for op blocker management Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 20/50] virtio-scsi: Catch BDS-BB removal/insertion Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 21/50] nbd: Switch from close to eject notifier Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 22/50] block: Remove BDS close notifier Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 23/50] block: Use blk_remove_bs() in blk_delete() Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 24/50] blockdev: Use blk_remove_bs() in do_drive_del() Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 25/50] block: Make bdrv_close() static Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 26/50] block: Add list of all BlockDriverStates Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 27/50] blockdev: Keep track of monitor-owned BDS Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 28/50] block: Add blk_remove_all_bs() Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 29/50] block: Rewrite bdrv_close_all() Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 30/50] iotests: Add test for multiple BB on BDS tree Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 31/50] iotests: Add test for block jobs and BDS ejection Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 32/50] block: acquire in bdrv_query_image_info Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 33/50] block: Add "file" output parameter to block status query functions Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 34/50] qcow: Assign bs->file->bs to file in qcow_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 35/50] qcow2: Assign bs->file->bs to file in qcow2_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 36/50] raw: Assign bs to file in raw_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 37/50] iscsi: Assign bs to file in iscsi_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 38/50] parallels: Assign bs->file->bs to file in parallels_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 39/50] qed: Assign bs->file->bs to file in bdrv_qed_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 40/50] sheepdog: Assign bs to file in sd_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 41/50] vdi: Assign bs->file->bs to file in vdi_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 42/50] vpc: Assign bs->file->bs to file in vpc_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 43/50] vmdk: Fix calculation of block status's offset Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 44/50] vmdk: Return extent's file in bdrv_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 45/50] block: Use returned *file in bdrv_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 46/50] qemu-img: In "map", use the returned "file" from bdrv_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 47/50] qemu-img: Make MapEntry a QAPI struct Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 48/50] iotests: Add "qemu-img map" test for VMDK extents Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 49/50] block: set device_list.tqe_prev to NULL on BDS removal Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 50/50] block: qemu-iotests - add test for snapshot, commit, snapshot bug Max Reitz
2016-02-02 20:25 ` [Qemu-devel] [PULL v2 00/50] Block patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454434543-25963-18-git-send-email-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).