[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 11/48] iotests: Make _filter_nbd drop log lines
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 11/48] iotests: Make _filter_nbd drop log lines |
Date: |
Fri, 29 Jan 2016 18:37:17 +0100 |
From: Max Reitz <address@hidden>
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <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#'
}
--
1.8.3.1
- [Qemu-block] [PULL 00/48] Block patches, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 01/48] block: Add blk_dev_has_tray(), Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 04/48] block/qapi: Emit tray_open only if there is a tray, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 05/48] vmdk: Fix converting to streamOptimized, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 03/48] Revert "hw/block/fdc: Implement tray status", Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 02/48] blockdev: Fix 'change' for slot devices, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 06/48] iotests: Limit supported formats for 118, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 07/48] nbd: client_close on error in nbd_co_client_start, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 11/48] iotests: Make _filter_nbd drop log lines,
Kevin Wolf <=
- [Qemu-block] [PULL 09/48] iotests: Change coding style of _filter_nbd in 083, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 08/48] iotests: Rename filter_nbd to _filter_nbd in 083, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 12/48] iotests: Make _filter_nbd support more URL types, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 10/48] iotests: Move _filter_nbd into common.filter, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 14/48] iotests: Add test for a nonexistent NBD export, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 15/48] block: Remove unused struct definition BlockFinishData, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 16/48] block: Release named dirty bitmaps in bdrv_close(), Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 19/48] virtio-blk: Functions for op blocker management, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 20/48] virtio-scsi: Catch BDS-BB removal/insertion, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 13/48] iotests: Make redirecting qemu's stderr optional, Kevin Wolf, 2016/01/29