[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/69] iotests/140: Create socket in $SOCK_DIR
From: |
Max Reitz |
Subject: |
[PULL 19/69] iotests/140: Create socket in $SOCK_DIR |
Date: |
Mon, 28 Oct 2019 13:14:11 +0100 |
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/140 | 8 ++++----
tests/qemu-iotests/140.out | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140
index b965b1dd5d..8d2ce5d9e3 100755
--- a/tests/qemu-iotests/140
+++ b/tests/qemu-iotests/140
@@ -34,7 +34,7 @@ _cleanup()
{
_cleanup_qemu
_cleanup_test_img
- rm -f "$TEST_DIR/nbd"
+ rm -f "$SOCK_DIR/nbd"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -69,7 +69,7 @@ _send_qemu_cmd $QEMU_HANDLE \
_send_qemu_cmd $QEMU_HANDLE \
"{ 'execute': 'nbd-server-start',
'arguments': { 'addr': { 'type': 'unix',
- 'data': { 'path': '$TEST_DIR/nbd' }}}}" \
+ 'data': { 'path': '$SOCK_DIR/nbd' }}}}" \
'return'
_send_qemu_cmd $QEMU_HANDLE \
@@ -78,7 +78,7 @@ _send_qemu_cmd $QEMU_HANDLE \
'return'
$QEMU_IO_PROG -f raw -r -c 'read -P 42 0 64k' \
- "nbd+unix:///drv?socket=$TEST_DIR/nbd" 2>&1 \
+ "nbd+unix:///drv?socket=$SOCK_DIR/nbd" 2>&1 \
| _filter_qemu_io | _filter_nbd
_send_qemu_cmd $QEMU_HANDLE \
@@ -87,7 +87,7 @@ _send_qemu_cmd $QEMU_HANDLE \
'return'
$QEMU_IO_PROG -f raw -r -c close \
- "nbd+unix:///drv?socket=$TEST_DIR/nbd" 2>&1 \
+ "nbd+unix:///drv?socket=$SOCK_DIR/nbd" 2>&1 \
| _filter_qemu_io | _filter_nbd
_send_qemu_cmd $QEMU_HANDLE \
diff --git a/tests/qemu-iotests/140.out b/tests/qemu-iotests/140.out
index 67fe44a3e3..2511eb7369 100644
--- a/tests/qemu-iotests/140.out
+++ b/tests/qemu-iotests/140.out
@@ -8,7 +8,7 @@ wrote 65536/65536 bytes at offset 0
read 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
{"return": {}}
-qemu-io: can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested
export not available
+qemu-io: can't open device nbd+unix:///drv?socket=SOCK_DIR/nbd: Requested
export not available
server reported: export 'drv' not present
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
--
2.21.0
- [PULL 07/69] iotests: Cache supported_formats(), (continued)
- [PULL 07/69] iotests: Cache supported_formats(), Max Reitz, 2019/10/28
- [PULL 09/69] block/mirror: simplify do_sync_target_write, Max Reitz, 2019/10/28
- [PULL 10/69] block/block-backend: add blk_co_pwritev_part, Max Reitz, 2019/10/28
- [PULL 11/69] block/mirror: support unaligned write in active mirror, Max Reitz, 2019/10/28
- [PULL 12/69] Revert "mirror: Only mirror granularity-aligned chunks", Max Reitz, 2019/10/28
- [PULL 13/69] iotests: Introduce $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 14/69] iotests.py: Store socket files in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 15/69] iotests.py: Add @base_dir to FilePaths etc., Max Reitz, 2019/10/28
- [PULL 16/69] iotests: Filter $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 17/69] iotests: Let common.nbd create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 19/69] iotests/140: Create socket in $SOCK_DIR,
Max Reitz <=
- [PULL 18/69] iotests/083: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 21/69] iotests/147: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 20/69] iotests/143: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 22/69] iotests/181: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 23/69] iotests/182: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 24/69] iotests/183: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 25/69] iotests/192: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 28/69] iotests/205: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 27/69] iotests/201: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 26/69] iotests/194: Create sockets in $SOCK_DIR, Max Reitz, 2019/10/28