Commit a7552b52 authored by Max Reitz's avatar Max Reitz
Browse files

iotests/083: 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-7-mreitz@redhat.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 5759322a
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -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 &
+17 −17
Original line number Diff line number Diff line
@@ -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 ===