OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

iotests: Make _filter_nbd drop log lines 

The NBD log lines ("/your/source/dir/nbd/xyz.c:function():line: error")
should not be converted to empty lines but removed altogether.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2016-01-25 19:41:12 +01:00
parent 60d446881d
commit dd170c0677
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/qemu-iotests/083.out
View File

@ -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

2
tests/qemu-iotests/common.filter
View File

@ -237,7 +237,7 @@ _filter_nbd()
# receive callbacks sometimes, making them unreliable.
#
# Filter out the TCP port number since this changes between runs.
sed -e 's#^.*nbd/.*\.c:.*##g' \
sed -e '/nbd\/.*\.c:/d' \
-e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \
-e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#'
}