[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 5/8] iotests: Make _filter_nbd drop log lines
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH 5/8] iotests: Make _filter_nbd drop log lines |
Date: |
Mon, 25 Jan 2016 19:41:12 +0100 |
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 <address@hidden>
---
tests/qemu-iotests/083.out | 10 ----------
tests/qemu-iotests/common.filter | 2 +-
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/tests/qemu-iotests/083.out b/tests/qemu-iotests/083.out
index 78cc49a..ef3d1e3 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 33ed1e4..e1bfdb7 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -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#'
}
--
2.7.0
- Re: [Qemu-block] [Qemu-devel] [PATCH 1/8] nbd: client_close on error in nbd_co_client_start, (continued)
- [Qemu-block] [PATCH 2/8] iotests: Rename filter_nbd to _filter_nbd in 083, Max Reitz, 2016/01/25
- [Qemu-block] [PATCH 3/8] iotests: Change coding style of _filter_nbd in 083, Max Reitz, 2016/01/25
- [Qemu-block] [PATCH 4/8] iotests: Move _filter_nbd into common.filter, Max Reitz, 2016/01/25
- [Qemu-block] [PATCH 5/8] iotests: Make _filter_nbd drop log lines,
Max Reitz <=
- [Qemu-block] [PATCH 6/8] iotests: Make _filter_nbd support more URL types, Max Reitz, 2016/01/25
- [Qemu-block] [PATCH 7/8] iotests: Make redirecting qemu's stderr optional, Max Reitz, 2016/01/25
- [Qemu-block] [PATCH 8/8] iotests: Add test for a nonexistent NBD export, Max Reitz, 2016/01/25
- Re: [Qemu-block] [PATCH 0/8] nbd: Fix failed assertion on negotiation error, Kevin Wolf, 2016/01/26