From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Thomas Huth <thuth@redhat.com>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PATCH v2 06/23] iotests/083: Create socket in $SOCK_DIR
Date: Thu, 17 Oct 2019 15:31:38 +0200 [thread overview]
Message-ID: <20191017133155.5327-7-mreitz@redhat.com> (raw)
In-Reply-To: <20191017133155.5327-1-mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/083 | 6 +++---
tests/qemu-iotests/083.out | 34 +++++++++++++++++-----------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083
index b270550d3e..10fdfc8ebb 100755
--- a/tests/qemu-iotests/083
+++ b/tests/qemu-iotests/083
@@ -28,7 +28,7 @@ status=1 # failure is the default!
_cleanup()
{
- rm -f nbd.sock
+ rm -f "$SOCK_DIR/nbd.sock"
rm -f nbd-fault-injector.out
rm -f nbd-fault-injector.conf
}
@@ -80,10 +80,10 @@ EOF
if [ "$proto" = "tcp" ]; then
nbd_addr="127.0.0.1:0"
else
- nbd_addr="$TEST_DIR/nbd.sock"
+ nbd_addr="$SOCK_DIR/nbd.sock"
fi
- rm -f "$TEST_DIR/nbd.sock"
+ rm -f "$SOCK_DIR/nbd.sock"
echo > "$TEST_DIR/nbd-fault-injector.out"
$PYTHON nbd-fault-injector.py $extra_args "$nbd_addr" "$TEST_DIR/nbd-fault-injector.conf" >"$TEST_DIR/nbd-fault-injector.out" 2>&1 &
diff --git a/tests/qemu-iotests/083.out b/tests/qemu-iotests/083.out
index eee6dd1379..2090ee693c 100644
--- a/tests/qemu-iotests/083.out
+++ b/tests/qemu-iotests/083.out
@@ -110,43 +110,43 @@ read failed: Input/output error
=== Check disconnect before neg1 ===
-qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=SOCK_DIR/nbd.sock
=== Check disconnect after neg1 ===
-qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=SOCK_DIR/nbd.sock
=== Check disconnect 8 neg1 ===
-qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=SOCK_DIR/nbd.sock
=== Check disconnect 16 neg1 ===
-qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=SOCK_DIR/nbd.sock
=== Check disconnect before export ===
-qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=SOCK_DIR/nbd.sock
=== Check disconnect after export ===
-qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=SOCK_DIR/nbd.sock
=== Check disconnect 4 export ===
-qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=SOCK_DIR/nbd.sock
=== Check disconnect 12 export ===
-qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=SOCK_DIR/nbd.sock
=== Check disconnect 16 export ===
-qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=SOCK_DIR/nbd.sock
=== Check disconnect before neg2 ===
-qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=SOCK_DIR/nbd.sock
=== Check disconnect after neg2 ===
@@ -154,11 +154,11 @@ read failed: Input/output error
=== Check disconnect 8 neg2 ===
-qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=SOCK_DIR/nbd.sock
=== Check disconnect 10 neg2 ===
-qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=SOCK_DIR/nbd.sock
=== Check disconnect before request ===
@@ -195,23 +195,23 @@ read 512/512 bytes at offset 0
=== Check disconnect before neg-classic ===
-qemu-io: can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///?socket=SOCK_DIR/nbd.sock
=== Check disconnect 8 neg-classic ===
-qemu-io: can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///?socket=SOCK_DIR/nbd.sock
=== Check disconnect 16 neg-classic ===
-qemu-io: can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///?socket=SOCK_DIR/nbd.sock
=== Check disconnect 24 neg-classic ===
-qemu-io: can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///?socket=SOCK_DIR/nbd.sock
=== Check disconnect 28 neg-classic ===
-qemu-io: can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///?socket=SOCK_DIR/nbd.sock
=== Check disconnect after neg-classic ===
--
2.21.0
next prev parent reply other threads:[~2019-10-17 14:22 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-17 13:31 [PATCH v2 00/23] iotests: Add and use $SOCK_DIR Max Reitz
2019-10-17 13:31 ` [PATCH v2 01/23] iotests: Introduce $SOCK_DIR Max Reitz
2019-10-17 14:52 ` Eric Blake
2019-10-18 9:03 ` Max Reitz
2019-10-18 13:30 ` Eric Blake
2019-10-17 13:31 ` [PATCH v2 02/23] iotests.py: Store socket files in $SOCK_DIR Max Reitz
2019-10-17 13:31 ` [PATCH v2 03/23] iotests.py: Add @base_dir to FilePaths etc Max Reitz
2019-10-17 13:31 ` [PATCH v2 04/23] iotests: Filter $SOCK_DIR Max Reitz
2019-10-17 15:50 ` Thomas Huth
2019-10-17 13:31 ` [PATCH v2 05/23] iotests: Let common.nbd create socket in $SOCK_DIR Max Reitz
2019-10-17 15:52 ` Thomas Huth
2019-10-17 13:31 ` Max Reitz [this message]
2019-10-17 13:31 ` [PATCH v2 07/23] iotests/140: Create " Max Reitz
2019-10-17 13:31 ` [PATCH v2 08/23] iotests/143: " Max Reitz
2019-10-17 13:31 ` [PATCH v2 09/23] iotests/147: " Max Reitz
2019-10-17 13:31 ` [PATCH v2 10/23] iotests/181: " Max Reitz
2019-10-17 13:31 ` [PATCH v2 11/23] iotests/182: " Max Reitz
2019-10-17 13:31 ` [PATCH v2 12/23] iotests/183: " Max Reitz
2019-10-17 13:31 ` [PATCH v2 13/23] iotests/192: " Max Reitz
2019-10-17 15:53 ` Thomas Huth
2019-10-17 13:31 ` [PATCH v2 14/23] iotests/194: Create sockets " Max Reitz
2019-10-17 13:31 ` [PATCH v2 15/23] iotests/201: Create socket " Max Reitz
2019-10-17 15:55 ` Thomas Huth
2019-10-17 13:31 ` [PATCH v2 16/23] iotests/205: " Max Reitz
2019-10-17 15:56 ` Thomas Huth
2019-10-17 13:31 ` [PATCH v2 17/23] iotests/208: " Max Reitz
2019-10-17 13:31 ` [PATCH v2 18/23] iotests/209: " Max Reitz
2019-10-17 13:31 ` [PATCH v2 19/23] iotests/222: " Max Reitz
2019-10-17 13:31 ` [PATCH v2 20/23] iotests/223: " Max Reitz
2019-10-17 15:57 ` Thomas Huth
2019-10-17 13:31 ` [PATCH v2 21/23] iotests/240: " Max Reitz
2019-10-17 15:57 ` Thomas Huth
2019-10-17 13:31 ` [PATCH v2 22/23] iotests/267: " Max Reitz
2019-10-17 15:58 ` Thomas Huth
2019-10-17 13:31 ` [PATCH v2 23/23] iotests: Drop TEST_DIR filter from _filter_nbd Max Reitz
2019-10-17 15:58 ` Thomas Huth
2019-10-17 14:59 ` [PATCH v2 00/23] iotests: Add and use $SOCK_DIR Eric Blake
2019-10-18 16:02 ` Max Reitz
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=20191017133155.5327-7-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@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).