diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2017-08-29 13:27:45 +0100 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2017-08-30 13:00:38 -0500 |
| commit | 02d2d860d25e439f0e88658c701668ab684568fb (patch) | |
| tree | 8902875b8e278fc5aad1ff57b4356f73b43e6f12 /tests/qemu-iotests/common.filter | |
| parent | 6e592fc92234a58c7156c385840633c17dedd24f (diff) | |
qemu-iotests: test NBD over UNIX domain sockets in 083
083 only tests TCP. Some failures might be specific to UNIX domain
sockets.
A few adjustments are necessary:
1. Generating a port number and waiting for server startup is
TCP-specific. Use the new nbd-fault-injector.py startup protocol to
fetch the address. This is a little more elegant because we don't
need netstat anymore.
2. The NBD filter does not work for the UNIX domain sockets URIs we
generate and must be extended.
3. Run all tests twice: once for TCP and once for UNIX domain sockets.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20170829122745.14309-4-stefanha@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/common.filter')
| -rw-r--r-- | tests/qemu-iotests/common.filter | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 7a58e57317..9d5442ecd9 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -170,9 +170,9 @@ _filter_nbd() # # Filter out the TCP port number since this changes between runs. sed -e '/nbd\/.*\.c:/d' \ - -e 's#nbd:\(//\)\?127\.0\.0\.1:[0-9]*#nbd:\1127.0.0.1:PORT#g' \ + -e 's#127\.0\.0\.1:[0-9]*#127.0.0.1:PORT#g' \ -e "s#?socket=$TEST_DIR#?socket=TEST_DIR#g" \ - -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#' + -e 's#\(foo\|PORT/\?\|.sock\): Failed to .*$#\1#' } # make sure this script returns success |