Commit 46cabce6 authored by Max Reitz's avatar Max Reitz
Browse files

iotests/140: Create socket in $SOCK_DIR 



Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Message-id: 20191017133155.5327-8-mreitz@redhat.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent a7552b52

tests/qemu-iotests/140

+4 −4
Original line number Diff line number Diff line
@@ -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 \

tests/qemu-iotests/140.out

+1 −1
Original line number Diff line number Diff line
@@ -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"}}