Commit 876df72d authored May 06, 2019 by Max Reitz Committed by Eric Blake May 07, 2019

iotests: Fix 233 for ports other than 10809



233 generally filters the port, but in two cases does not.  If some
other concurrently running application has already taken port 10809,
this will result in an output mismatch.  Fix this by applying the
filter in these two cases, too.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20190506160529.6955-1-mreitz@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>

parent c4e2aff8

tests/qemu-iotests/233

+4 −2

Original line number	Diff line number	Diff line
		@@ -139,11 +139,13 @@ nbd_server_start_tcp_socket \

		$QEMU_IMG info --image-opts \
		--object tls-creds-x509,dir=${tls_dir}/client1,endpoint=client,id=tls0 \
		driver=nbd,host=$nbd_tcp_addr,port=$nbd_tcp_port,tls-creds=tls0
		driver=nbd,host=$nbd_tcp_addr,port=$nbd_tcp_port,tls-creds=tls0 \
		2>&1 \| sed "s/$nbd_tcp_port/PORT/g"

		$QEMU_IMG info --image-opts \
		--object tls-creds-x509,dir=${tls_dir}/client3,endpoint=client,id=tls0 \
		driver=nbd,host=$nbd_tcp_addr,port=$nbd_tcp_port,tls-creds=tls0
		driver=nbd,host=$nbd_tcp_addr,port=$nbd_tcp_port,tls-creds=tls0 \
		2>&1 \| sed "s/$nbd_tcp_port/PORT/g"

		echo
		echo "== final server log =="

tests/qemu-iotests/233.out

+2 −2

Original line number	Diff line number	Diff line
		@@ -57,8 +57,8 @@ read 1048576/1048576 bytes at offset 1048576
		1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

		== check TLS with authorization ==
		qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=10809,tls-creds=tls0': Failed to read option reply: Cannot read from TLS channel: Software caused connection abort
		qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=10809,tls-creds=tls0': Failed to read option reply: Cannot read from TLS channel: Software caused connection abort
		qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=PORT,tls-creds=tls0': Failed to read option reply: Cannot read from TLS channel: Software caused connection abort
		qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=PORT,tls-creds=tls0': Failed to read option reply: Cannot read from TLS channel: Software caused connection abort

		== final server log ==
		qemu-nbd: option negotiation failed: Verify failed: No certificate was found.