Skip to contentSkip to conversation

iotests: fix expected output from gnutls in NBD test

PATCH In review Daniel P. Berrangé 2 participants 2 messages Aug 29, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iotests: fix expected output from gnutls in NBD test

Error reporting from gnutls was improved by:

commit 57941c9c86357a6a642f9ee3279d881df4043b6d
Author: Daniel P. Berrangé <[email protected]>
Date: Fri Mar 15 14:07:58 2024 +0000

crypto: push error reporting into TLS session I/O APIs

This has the effect of changing the output from one of the NBD tests.

---

NB, wrt qemu-stable this will be for the 9.1 stable branch once that is created, no earlier releases will need this.

 tests/qemu-iotests/233.out | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
tests/qemu-iotests/233.out +6 -6
index 1910f7df20..d498d55e0e 100644
@@ -69,8 +69,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=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
+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: The TLS connection was non-properly terminated.
+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: The TLS connection was non-properly terminated.
 
 == check TLS fail over UNIX with no hostname ==
 qemu-img: Could not open 'driver=nbd,path=SOCK_DIR/qemu-nbd.sock,tls-creds=tls0': No hostname for certificate validation
@@ -103,14 +103,14 @@ qemu-img: Could not open 'driver=nbd,path=SOCK_DIR/qemu-nbd.sock,tls-creds=tls0'
 qemu-nbd: TLS handshake failed: The TLS connection was non-properly terminated.
 
 == final server log ==
-qemu-nbd: option negotiation failed: Failed to read opts magic: Cannot read from TLS channel: Software caused connection abort
-qemu-nbd: option negotiation failed: Failed to read opts magic: Cannot read from TLS channel: Software caused connection abort
+qemu-nbd: option negotiation failed: Failed to read opts magic: Cannot read from TLS channel: The TLS connection was non-properly terminated.
+qemu-nbd: option negotiation failed: Failed to read opts magic: Cannot read from TLS channel: The TLS connection was non-properly terminated.
 qemu-nbd: option negotiation failed: Verify failed: No certificate was found.
 qemu-nbd: option negotiation failed: Verify failed: No certificate was found.
 qemu-nbd: option negotiation failed: TLS x509 authz check for DISTINGUISHED-NAME is denied
 qemu-nbd: option negotiation failed: TLS x509 authz check for DISTINGUISHED-NAME is denied
-qemu-nbd: option negotiation failed: Failed to read opts magic: Cannot read from TLS channel: Software caused connection abort
-qemu-nbd: option negotiation failed: Failed to read opts magic: Cannot read from TLS channel: Software caused connection abort
+qemu-nbd: option negotiation failed: Failed to read opts magic: Cannot read from TLS channel: The TLS connection was non-properly terminated.
+qemu-nbd: option negotiation failed: Failed to read opts magic: Cannot read from TLS channel: The TLS connection was non-properly terminated.
 qemu-nbd: option negotiation failed: TLS handshake failed: An illegal parameter has been received.
 qemu-nbd: option negotiation failed: TLS handshake failed: An illegal parameter has been received.
 *** done
Signature · 1 line
2.45.2
Tested-by on v1 1/1
#1 lore raw
Quoted 13 lines · Daniel P. Berrangé

Error reporting from gnutls was improved by:

commit 57941c9c86357a6a642f9ee3279d881df4043b6d
Author: Daniel P. Berrangé <[email protected]>
Date: Fri Mar 15 14:07:58 2024 +0000

crypto: push error reporting into TLS session I/O APIs

This has the effect of changing the output from one of the NBD tests.

Quoted 7 lines

---

NB, wrt qemu-stable this will be for the 9.1 stable branch once that is created, no earlier releases will need this.

  tests/qemu-iotests/233.out | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)

Thanks, that fixes the issue, indeed.