On Tue, 02/24 10:35, Max Reitz wrote:
> _filter_nbd can be useful for other NBD tests, too, therefore it should
> reside in common.filter, and it should support URLs of the "nbd://"
> format and export names.
>
> The NBD log lines ("/your/source/dir/nbd.c:function():line: error")
> should not be converted to empty lines but removed altogether.
>
> Signed-off-by: Max Reitz <mre...@redhat.com>
> ---
> tests/qemu-iotests/083 | 13 +------------
> tests/qemu-iotests/083.out | 10 ----------
> tests/qemu-iotests/common.filter | 12 ++++++++++++
> 3 files changed, 13 insertions(+), 22 deletions(-)
>
> diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083
> index 1b2d3f1..aa99278 100755
> --- a/tests/qemu-iotests/083
> +++ b/tests/qemu-iotests/083
> @@ -49,17 +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
> @@ -84,7 +73,7 @@ EOF
>
> $PYTHON nbd-fault-injector.py $extra_args "127.0.0.1:$port"
> "$TEST_DIR/nbd-fault-injector.conf" 2>&1 >/dev/null &
> wait_for_tcp_port "127\\.0\\.0\\.1:$port"
> - $QEMU_IO -c "read 0 512" "$nbd_url" 2>&1 | _filter_qemu_io | filter_nbd
> + $QEMU_IO -c "read 0 512" "$nbd_url" 2>&1 | _filter_qemu_io | _filter_nbd
>
> echo
> }
> diff --git a/tests/qemu-iotests/083.out b/tests/qemu-iotests/083.out
> index 8c1441b..5c9141b 100644
> --- a/tests/qemu-iotests/083.out
> +++ b/tests/qemu-iotests/083.out
> @@ -51,7 +51,6 @@ no file open, try 'help open'
>
> === Check disconnect after neg2 ===
>
> -
> read failed: Input/output error
>
> === Check disconnect 8 neg2 ===
> @@ -66,42 +65,34 @@ no file open, try 'help open'
>
> === Check disconnect before request ===
>
> -
> read failed: Input/output error
>
> === Check disconnect after request ===
>
> -
> read failed: Input/output error
>
> === Check disconnect before reply ===
>
> -
> read failed: Input/output error
>
> === Check disconnect after reply ===
>
> -
> read failed: Input/output error
>
> === Check disconnect 4 reply ===
>
> -
> read failed: Input/output error
>
> === Check disconnect 8 reply ===
>
> -
> read failed: Input/output error
>
> === Check disconnect before data ===
>
> -
> read failed: Input/output error
>
> === Check disconnect after data ===
>
> -
> read 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>
> @@ -132,7 +123,6 @@ no file open, try 'help open'
>
> === Check disconnect after neg-classic ===
>
> -
> read failed: Input/output error
>
> *** done
> diff --git a/tests/qemu-iotests/common.filter
> b/tests/qemu-iotests/common.filter
> index 012a812..3019e66 100644
> --- a/tests/qemu-iotests/common.filter
> +++ b/tests/qemu-iotests/common.filter
> @@ -225,5 +225,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 '/^.*nbd\.c:.*/d' \
Could be:
sed -e '/nbd\.c:/d' \
> + -e 's#nbd:\(//\)\?127\.0\.0\.1:[0-9]*#nbd:\1127.0.0.1:PORT#g' \
> + -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#'
> +}
> +
> # make sure this script returns success
> true
> --
> 2.1.0
>
>
