diff options
| author | Max Reitz <mreitz@redhat.com> | 2016-01-25 19:41:11 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2016-02-02 17:49:42 +0100 |
| commit | 60d446881deefc280e60c195009f7f07ac50eeac (patch) | |
| tree | 3d6401d7e2ae3e4f08dfc0ae8a5be56f070d85ac | |
| parent | d1f9cd70843f9d66948da46744b656babcc964f8 (diff) | |
iotests: Move _filter_nbd into common.filter
_filter_nbd can be useful for other NBD tests, too, therefore it should
reside in common.filter.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rwxr-xr-x | tests/qemu-iotests/083 | 12 | ||||
| -rw-r--r-- | tests/qemu-iotests/common.filter | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083 index 36e6de8168..aa99278fd8 100755 --- a/tests/qemu-iotests/083 +++ b/tests/qemu-iotests/083 @@ -49,18 +49,6 @@ wait_for_tcp_port() { done } -_filter_nbd() -{ - # nbd.c error messages contain function names and line numbers that are - # prone to change. Message ordering depends on timing between send and - # receive callbacks sometimes, making them unreliable. - # - # Filter out the TCP port number since this changes between runs. - sed -e 's#^.*nbd/.*\.c:.*##g' \ - -e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \ - -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#' -} - check_disconnect() { event=$1 when=$2 diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index cfdb6338aa..33ed1e42ab 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -230,5 +230,17 @@ _filter_qemu_img_map() -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt } +_filter_nbd() +{ + # nbd.c error messages contain function names and line numbers that are + # prone to change. Message ordering depends on timing between send and + # receive callbacks sometimes, making them unreliable. + # + # Filter out the TCP port number since this changes between runs. + sed -e 's#^.*nbd/.*\.c:.*##g' \ + -e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \ + -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#' +} + # make sure this script returns success true |