mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iotests/083: Create socket in $SOCK_DIR

Browse Source 
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-7-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Max Reitz 2019-10-17 15:31:38 +02:00
parent 5759322ab0
commit a7552b5233
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/qemu-iotests/083
View File

@ -28,7 +28,7 @@ status=1 # failure is the default!
_cleanup() _cleanup()
{ {
rm -f nbd.sock rm -f "$SOCK_DIR/nbd.sock"
rm -f nbd-fault-injector.out rm -f nbd-fault-injector.out
rm -f nbd-fault-injector.conf rm -f nbd-fault-injector.conf
} }
@ -80,10 +80,10 @@ EOF
if [ "$proto" = "tcp" ]; then if [ "$proto" = "tcp" ]; then
nbd_addr="127.0.0.1:0" nbd_addr="127.0.0.1:0"
else else
nbd_addr="$TEST_DIR/nbd.sock" nbd_addr="$SOCK_DIR/nbd.sock"
fi fi
rm -f "$TEST_DIR/nbd.sock" rm -f "$SOCK_DIR/nbd.sock"
echo > "$TEST_DIR/nbd-fault-injector.out" 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 & $PYTHON nbd-fault-injector.py $extra_args "$nbd_addr" "$TEST_DIR/nbd-fault-injector.conf" >"$TEST_DIR/nbd-fault-injector.out" 2>&1 &

34
tests/qemu-iotests/083.out
View File

@ -110,43 +110,43 @@ read failed: Input/output error
=== Check disconnect before neg1 === === 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 === === 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 === === 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 === === 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 === === 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 === === 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 === === 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 === === 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 === === 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 === === 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 === === Check disconnect after neg2 ===
@ -154,11 +154,11 @@ read failed: Input/output error
=== Check disconnect 8 neg2 === === 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 === === 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 === === Check disconnect before request ===
@ -195,23 +195,23 @@ read 512/512 bytes at offset 0
=== Check disconnect before neg-classic === === 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 === === 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 === === 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 === === 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 === === 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 === === Check disconnect after neg-classic ===