diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2022-03-04 19:36:05 +0000 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2022-03-07 15:58:42 -0600 |
| commit | 7470bf87d30f3105777003a1e3a56c223ce47d2e (patch) | |
| tree | 77bd8b54ba7f51528ab04b9af47f41c0cc087df1 /tests/qemu-iotests | |
| parent | cf168e398b83f8ed963b1e6b0bc546c6387be598 (diff) | |
| download | qemu-7470bf87d30f3105777003a1e3a56c223ce47d2e.zip qemu-7470bf87d30f3105777003a1e3a56c223ce47d2e.tar.gz qemu-7470bf87d30f3105777003a1e3a56c223ce47d2e.tar.bz2 | |
tests/qemu-iotests: expand _filter_nbd rules
Some tests will want to use 'localhost' instead of '127.0.0.1', and
some will use the image options syntax rather than the classic URI
syntax.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220304193610.3293146-8-berrange@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
| -rw-r--r-- | tests/qemu-iotests/common.filter | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 21819db..f53d8cb 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -301,6 +301,10 @@ _filter_nbd() # Filter out the TCP port number since this changes between runs. sed -e '/nbd\/.*\.c:/d' \ -e 's#127\.0\.0\.1:[0-9]*#127.0.0.1:PORT#g' \ + -e 's#localhost:[0-9]*#localhost:PORT#g' \ + -e 's#host=127\.0\.0\.1,port=[0-9]*#host=127.0.0.1,port=PORT#g' \ + -e 's#host=localhost,port=[0-9]*#host=localhost,port=PORT#g' \ + -e "s#path=$SOCK_DIR#path=SOCK_DIR#g" \ -e "s#?socket=$SOCK_DIR#?socket=SOCK_DIR#g" \ -e 's#\(foo\|PORT/\?\|.sock\): Failed to .*$#\1#' } |