qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH v2 03/22] iotests: Add test for eject under NBD server
Date: Mon,  9 Feb 2015 13:38:25 -0500	[thread overview]
Message-ID: <1423507124-29809-4-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1423507124-29809-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>
---
 tests/qemu-iotests/096     | 89 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/096.out | 16 +++++++++
 tests/qemu-iotests/group   |  1 +
 3 files changed, 106 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..eba144e
--- /dev/null
+++ b/tests/qemu-iotests/096
@@ -0,0 +1,89 @@
+#!/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
+
+_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 1716269..1508d9b 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -101,6 +101,7 @@
 092 rw auto quick
 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
-- 
2.1.0

  parent reply	other threads:[~2015-02-09 18:38 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-09 18:38 [Qemu-devel] [PATCH v2 00/22] block: Rework bdrv_close_all() Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 01/22] iotests: Move _filter_nbd into common.filter Max Reitz
2015-02-16 19:31   ` Eric Blake
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 02/22] iotests: Do not redirect qemu's stderr Max Reitz
2015-02-09 18:38 ` Max Reitz [this message]
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 04/22] quorum: Fix close path Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 05/22] block: Move BDS close notifiers into BB Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 06/22] block: Add bdrv_close_all() notifiers Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 07/22] block: Add bdrv_close_all() handlers Max Reitz
2015-02-13 23:02   ` Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 08/22] block: Use blk_remove_bs() in blk_delete() Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 09/22] blockdev: Use blk_remove_bs() in do_drive_del() Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 10/22] block: Make bdrv_close() static Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 11/22] block: Add blk_name_taken() Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 12/22] block: Add blk_next_inserted() Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 13/22] block: Add blk_commit_all() and blk_invalidate_cache_all() Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 14/22] block: Use BlockBackend more Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 15/22] blockdev: Add list of monitor-owned BlockBackends Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 16/22] blockdev: Remove blk_hide_on_behalf_of_do_drive_del() Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 17/22] block: Make bdrv_drain_one() public Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 18/22] block: Move some bdrv_*_all() functions to BB Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 19/22] block: Remove bdrv_states Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 20/22] blockdev: Keep track of monitor-owned BDS Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 21/22] block: Strip down bdrv_close_all() Max Reitz
2015-02-09 18:38 ` [Qemu-devel] [PATCH v2 22/22] iotests: Add test for multiple BB on BDS tree Max Reitz
2015-02-10  8:23 ` [Qemu-devel] [PATCH v2 00/22] block: Rework bdrv_close_all() Paolo Bonzini

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=1423507124-29809-4-git-send-email-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /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).