diff options
| author | Eric Blake <eblake@redhat.com> | 2019-01-17 13:36:38 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2019-01-21 15:49:51 -0600 |
| commit | d08980511d78480ffbbd9897b7fd050bd03d518d (patch) | |
| tree | 4c203a449a7eb71bc1dd6d53d192d47bf2a3d1fe /tests/qemu-iotests/233.out | |
| parent | 166609e6070fab3424510ac7292ecb585f8b80fb (diff) | |
iotests: Make 233 output more reliable
We have a race between the nbd server and the client both trying
to report errors at once which can make the test sometimes fail
if the output lines swap order under load. Break the race by
collecting server messages into a file and then replaying that
at the end of the test.
We may yet want to fix the server to not output ANYTHING for a
client action except when -v was used (to avoid malicious clients
from being able to DoS a server by filling up its logs), but that
is saved for a future patch.
Signed-off-by: Eric Blake <eblake@redhat.com>
CC: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20190117193658.16413-2-eblake@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/233.out')
| -rw-r--r-- | tests/qemu-iotests/233.out | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/qemu-iotests/233.out b/tests/qemu-iotests/233.out index 5f416721b0..2199d8a8b3 100644 --- a/tests/qemu-iotests/233.out +++ b/tests/qemu-iotests/233.out @@ -27,7 +27,6 @@ virtual size: 64M (67108864 bytes) disk size: unavailable == check TLS with different CA fails == -qemu-nbd: option negotiation failed: Verify failed: No certificate was found. qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=PORT,tls-creds=tls0': The certificate hasn't got a known issuer == perform I/O over TLS == @@ -37,4 +36,7 @@ wrote 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) read 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +== final server log == +qemu-nbd: option negotiation failed: Verify failed: No certificate was found. *** done |