Skip to contentSkip to conversation

tests: fix nbd test to work correctly with raw images

PATCH Applied Daniel P. Berrangé 3 participants 3 messages Nov 20, 2018 – Nov 21, 2018

lore
Share & tools
lore

Daniel P. Berrangé

author
#0 lore raw

PATCH 1/1 tests: fix nbd test to work correctly with raw images

The first qemu-io command must honour the $IMGFMT that is set rather than hardcoding qcow2. The qemu-nbd commands should also set $IMGFMT to avoid the insecure format probe warning.

Signed-off-by Daniel P. Berrangé <[email protected]>
---
 tests/qemu-iotests/233 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
tests/qemu-iotests/233 +6 -3
index a4da60d0ad..1814efe333 100755
@@ -66,7 +66,7 @@ $QEMU_IO -c 'w -P 0x11 1m 1m' "$TEST_IMG" | _filter_qemu_io
 
 echo
 echo "== check TLS client to plain server fails =="
-nbd_server_start_tcp_socket "$TEST_IMG"
+nbd_server_start_tcp_socket -f $IMGFMT "$TEST_IMG"
 
 $QEMU_IMG info --image-opts \
     --object tls-creds-x509,dir=${tls_dir}/client1,endpoint=client,id=tls0 \

@@ -78,7 +78,10 @@ nbd_server_stop
 echo
 echo "== check plain client to TLS server fails =="
 
-nbd_server_start_tcp_socket --object tls-creds-x509,dir=${tls_dir}/server1,endpoint=server,id=tls0,verify-peer=yes --tls-creds tls0 "$TEST_IMG"
+nbd_server_start_tcp_socket \
+    --object tls-creds-x509,dir=${tls_dir}/server1,endpoint=server,id=tls0,verify-peer=yes \
+    --tls-creds tls0 \
+    -f $IMGFMT "$TEST_IMG"
 
 $QEMU_IMG info nbd://localhost:$nbd_tcp_port 2>&1 | sed "s/$nbd_tcp_port/PORT/g"
 

@@ -104,7 +107,7 @@ $QEMU_IO -c 'r -P 0x11 1m 1m' -c 'w -P 0x22 1m 1m' --image-opts \
     driver=nbd,host=$nbd_tcp_addr,port=$nbd_tcp_port,tls-creds=tls0 \
     2>&1 | _filter_qemu_io
 
-$QEMU_IO -f qcow2 -r -U -c 'r -P 0x22 1m 1m' "$TEST_IMG" | _filter_qemu_io
+$QEMU_IO -f $IMGFMT -r -U -c 'r -P 0x22 1m 1m' "$TEST_IMG" | _filter_qemu_io
 
 # success, all done
 echo "*** done"
Signature · 1 line
2.19.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Daniel P. Berrangé

The first qemu-io command must honour the $IMGFMT that is set rather than hardcoding qcow2. The qemu-nbd commands should also set $IMGFMT to avoid the insecure format probe warning.

Signed-off-by Daniel P. Berrangé <[email protected]>
---
  tests/qemu-iotests/233 | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
Reviewed-by Eric Blake <[email protected]>

I'm fine if this goes through Kevin's tree (if he beats me to a next pull request) since he has been looking at other iotests issues; otherwise I'll plan on an NBD pull request for -rc3.

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org
Applied
#2 lore raw
In reply to Daniel P. Berrangé

[ Cc: qemu-block ]

Am 20.11.2018 um 18:56 hat Daniel P. Berrangé geschrieben:

Quoted 5 lines

The first qemu-io command must honour the $IMGFMT that is set rather than hardcoding qcow2. The qemu-nbd commands should also set $IMGFMT to avoid the insecure format probe warning.

Signed-off-by Daniel P. Berrangé <[email protected]>

Thanks, applied to the block branch.

Kevin