| Message ID | 20220303160330.2979753-9-berrange@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | nbd: enable use of TLS on non-TCP transports and other TLS improvements | expand |
On Thu, Mar 03, 2022 at 04:03:26PM +0000, Daniel P. Berrangé wrote: > Introduce a filter for the output of qemu-nbd export list so it can be > reused in multiple tests. > > The filter is a bit more permissive that what test 241 currently uses, > as its allows printing of the export count, along with any possible > error messages that might be emitted. > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > tests/qemu-iotests/241 | 6 +++--- > tests/qemu-iotests/241.out | 3 +++ > tests/qemu-iotests/common.filter | 5 +++++ > 3 files changed, 11 insertions(+), 3 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
On Fri, Mar 04, 2022 at 10:43:45AM -0600, Eric Blake wrote: > On Thu, Mar 03, 2022 at 04:03:26PM +0000, Daniel P. Berrangé wrote: > > Introduce a filter for the output of qemu-nbd export list so it can be > > reused in multiple tests. > > > > The filter is a bit more permissive that what test 241 currently uses, > > as its allows printing of the export count, along with any possible > > error messages that might be emitted. > > > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > > --- > > tests/qemu-iotests/241 | 6 +++--- > > tests/qemu-iotests/241.out | 3 +++ > > tests/qemu-iotests/common.filter | 5 +++++ > > 3 files changed, 11 insertions(+), 3 deletions(-) > > > > Reviewed-by: Eric Blake <eblake@redhat.com> I'm going to post a v2 with a slight tweak to expose one more interesting piece of (stable) info in the output: diff --git a/tests/qemu-iotests/241.out b/tests/qemu-iotests/241.out index db2d71ab9d..88e8cfcd7e 100644 --- a/tests/qemu-iotests/241.out +++ b/tests/qemu-iotests/241.out @@ -3,6 +3,7 @@ QA output created by 241 === Exporting unaligned raw image, natural alignment === exports available: 1 + export: '' size: 1024 min block: 1 [{ "start": 0, "length": 1000, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET}, @@ -12,6 +13,7 @@ exports available: 1 === Exporting unaligned raw image, forced server sector alignment === exports available: 1 + export: '' size: 1024 min block: 512 [{ "start": 0, "length": 1024, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET}] @@ -23,6 +25,7 @@ WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed === Exporting unaligned raw image, forced client sector alignment === exports available: 1 + export: '' size: 1024 min block: 1 [{ "start": 0, "length": 1000, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET}, diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 940c9884bd..14b6f80dcb 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -310,7 +310,7 @@ _filter_nbd() _filter_qemu_nbd_exports() { - grep '\(exports available\|size\|min block\|qemu-nbd\):' + grep '\(exports available\|export\|size\|min block\|qemu-nbd\):' } _filter_qmp_empty_return() Regards, Daniel
diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241 index c962c8b607..f196650afa 100755 --- a/tests/qemu-iotests/241 +++ b/tests/qemu-iotests/241 @@ -58,7 +58,7 @@ echo nbd_server_start_unix_socket -f $IMGFMT "$TEST_IMG_FILE" -$QEMU_NBD_PROG --list -k $nbd_unix_socket | grep '\(size\|min\)' +$QEMU_NBD_PROG --list -k $nbd_unix_socket | _filter_qemu_nbd_exports $QEMU_IMG map -f raw --output=json "$TEST_IMG" | _filter_qemu_img_map $QEMU_IO -f raw -c map "$TEST_IMG" nbd_server_stop @@ -71,7 +71,7 @@ echo # sector alignment, here at the server. nbd_server_start_unix_socket "$TEST_IMG_FILE" 2> "$TEST_DIR/server.log" -$QEMU_NBD_PROG --list -k $nbd_unix_socket | grep '\(size\|min\)' +$QEMU_NBD_PROG --list -k $nbd_unix_socket | _filter_qemu_nbd_exports $QEMU_IMG map -f raw --output=json "$TEST_IMG" | _filter_qemu_img_map $QEMU_IO -f raw -c map "$TEST_IMG" nbd_server_stop @@ -84,7 +84,7 @@ echo # Now force sector alignment at the client. nbd_server_start_unix_socket -f $IMGFMT "$TEST_IMG_FILE" -$QEMU_NBD_PROG --list -k $nbd_unix_socket | grep '\(size\|min\)' +$QEMU_NBD_PROG --list -k $nbd_unix_socket | _filter_qemu_nbd_exports $QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map $QEMU_IO -c map "$TEST_IMG" nbd_server_stop diff --git a/tests/qemu-iotests/241.out b/tests/qemu-iotests/241.out index 56e95b599a..db2d71ab9d 100644 --- a/tests/qemu-iotests/241.out +++ b/tests/qemu-iotests/241.out @@ -2,6 +2,7 @@ QA output created by 241 === Exporting unaligned raw image, natural alignment === +exports available: 1 size: 1024 min block: 1 [{ "start": 0, "length": 1000, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET}, @@ -10,6 +11,7 @@ QA output created by 241 === Exporting unaligned raw image, forced server sector alignment === +exports available: 1 size: 1024 min block: 512 [{ "start": 0, "length": 1024, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET}] @@ -20,6 +22,7 @@ WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed === Exporting unaligned raw image, forced client sector alignment === +exports available: 1 size: 1024 min block: 1 [{ "start": 0, "length": 1000, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET}, diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 25d1d22929..940c9884bd 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -308,6 +308,11 @@ _filter_nbd() -e 's#\(foo\|PORT/\?\|.sock\): Failed to .*$#\1#' } +_filter_qemu_nbd_exports() +{ + grep '\(exports available\|size\|min block\|qemu-nbd\):' +} + _filter_qmp_empty_return() { grep -v '{"return": {}}'
Introduce a filter for the output of qemu-nbd export list so it can be reused in multiple tests. The filter is a bit more permissive that what test 241 currently uses, as its allows printing of the export count, along with any possible error messages that might be emitted. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- tests/qemu-iotests/241 | 6 +++--- tests/qemu-iotests/241.out | 3 +++ tests/qemu-iotests/common.filter | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-)