[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/8] iotests: Make _filter_nbd support more URL type
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 6/8] iotests: Make _filter_nbd support more URL types |
Date: |
Mon, 25 Jan 2016 19:41:13 +0100 |
This function should support URLs of the "nbd://" format (without
swallowing the export name), and for "nbd:///" URLs it should replace
"?socket=$TEST_DIR" by "?socket=TEST_DIR" because putting the Unix
socket files into the test directory makes sense.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/common.filter | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index e1bfdb7..84b7434 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -238,7 +238,8 @@ _filter_nbd()
#
# Filter out the TCP port number since this changes between runs.
sed -e '/nbd\/.*\.c:/d' \
- -e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \
+ -e 's#nbd:\(//\)\?127\.0\.0\.1:[0-9]*#nbd:\1127.0.0.1:PORT#g' \
+ -e "s#?socket=$TEST_DIR#?socket=TEST_DIR#g" \
-e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#'
}
--
2.7.0
- [Qemu-devel] [PATCH 1/8] nbd: client_close on error in nbd_co_client_start, (continued)
- [Qemu-devel] [PATCH 1/8] nbd: client_close on error in nbd_co_client_start, Max Reitz, 2016/01/25
- [Qemu-devel] [PATCH 2/8] iotests: Rename filter_nbd to _filter_nbd in 083, Max Reitz, 2016/01/25
- [Qemu-devel] [PATCH 3/8] iotests: Change coding style of _filter_nbd in 083, Max Reitz, 2016/01/25
- [Qemu-devel] [PATCH 4/8] iotests: Move _filter_nbd into common.filter, Max Reitz, 2016/01/25
- [Qemu-devel] [PATCH 6/8] iotests: Make _filter_nbd support more URL types,
Max Reitz <=
- [Qemu-devel] [PATCH 5/8] iotests: Make _filter_nbd drop log lines, Max Reitz, 2016/01/25
- [Qemu-devel] [PATCH 7/8] iotests: Make redirecting qemu's stderr optional, Max Reitz, 2016/01/25
- [Qemu-devel] [PATCH 8/8] iotests: Add test for a nonexistent NBD export, Max Reitz, 2016/01/25
- Re: [Qemu-devel] [PATCH 0/8] nbd: Fix failed assertion on negotiation error, Kevin Wolf, 2016/01/26