diff options
| author | Max Reitz <mreitz@redhat.com> | 2019-10-17 15:31:40 +0200 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2019-10-28 11:22:31 +0100 |
| commit | 9a9c7c8f9834f18204a6586e6ddd902dab2b0bf9 (patch) | |
| tree | 4c3afbd7e64b925f542c77bc5331149609f9b095 /tests/qemu-iotests | |
| parent | 46cabce6c2d30c1ff2f3c1a4178f786dcc8ed672 (diff) | |
| download | qemu-9a9c7c8f9834f18204a6586e6ddd902dab2b0bf9.zip qemu-9a9c7c8f9834f18204a6586e6ddd902dab2b0bf9.tar.gz qemu-9a9c7c8f9834f18204a6586e6ddd902dab2b0bf9.tar.bz2 | |
iotests/143: Create socket in $SOCK_DIR
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 20191017133155.5327-9-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
| -rwxr-xr-x | tests/qemu-iotests/143 | 6 | ||||
| -rw-r--r-- | tests/qemu-iotests/143.out | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143 index 92249ac..f649b36 100755 --- a/tests/qemu-iotests/143 +++ b/tests/qemu-iotests/143 @@ -29,7 +29,7 @@ status=1 # failure is the default! _cleanup() { _cleanup_qemu - rm -f "$TEST_DIR/nbd" + rm -f "$SOCK_DIR/nbd" } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -51,12 +51,12 @@ _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' # This should just result in a client error, not in the server crashing $QEMU_IO_PROG -f raw -c quit \ - "nbd+unix:///no_such_export?socket=$TEST_DIR/nbd" 2>&1 \ + "nbd+unix:///no_such_export?socket=$SOCK_DIR/nbd" 2>&1 \ | _filter_qemu_io | _filter_nbd _send_qemu_cmd $QEMU_HANDLE \ diff --git a/tests/qemu-iotests/143.out b/tests/qemu-iotests/143.out index ee71b5a..037d34a 100644 --- a/tests/qemu-iotests/143.out +++ b/tests/qemu-iotests/143.out @@ -1,7 +1,7 @@ QA output created by 143 {"return": {}} {"return": {}} -qemu-io: can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available +qemu-io: can't open device nbd+unix:///no_such_export?socket=SOCK_DIR/nbd: Requested export not available server reported: export 'no_such_export' not present {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} |