[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL v2 08/50] iotests: Rename filter_nbd to _filter_nbd i
From: |
Max Reitz |
Subject: |
[Qemu-block] [PULL v2 08/50] iotests: Rename filter_nbd to _filter_nbd in 083 |
Date: |
Tue, 2 Feb 2016 18:35:01 +0100 |
In the patch after the next, this function is moved to common.filter.
Therefore, its name should be preceded by an underscore to signify its
global availability.
To keep the code motion patch clean, we cannot rename it in the same
patch, so we need to choose some order of renaming vs. motion. It is
better to keep a supposedly global function used by only a single test
in that test than to keep a supposedly local function in a common* file
and use it from a test, so we should rename the function before moving
it.
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>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/083 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083
index 566da99..13495bc 100755
--- a/tests/qemu-iotests/083
+++ b/tests/qemu-iotests/083
@@ -49,7 +49,7 @@ wait_for_tcp_port() {
done
}
-filter_nbd() {
+_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.
@@ -84,7 +84,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
}
--
2.7.0
- [Qemu-block] [PULL v2 00/50] Block patches, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 01/50] block: Add blk_dev_has_tray(), Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 02/50] blockdev: Fix 'change' for slot devices, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 04/50] block/qapi: Emit tray_open only if there is a tray, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 03/50] Revert "hw/block/fdc: Implement tray status", Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 05/50] vmdk: Fix converting to streamOptimized, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 06/50] iotests: Limit supported formats for 118, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 07/50] nbd: client_close on error in nbd_co_client_start, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 08/50] iotests: Rename filter_nbd to _filter_nbd in 083,
Max Reitz <=
- [Qemu-block] [PULL v2 09/50] iotests: Change coding style of _filter_nbd in 083, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 11/50] iotests: Make _filter_nbd drop log lines, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 10/50] iotests: Move _filter_nbd into common.filter, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 12/50] iotests: Make _filter_nbd support more URL types, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 13/50] iotests: Make redirecting qemu's stderr optional, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 14/50] iotests: Add test for a nonexistent NBD export, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 16/50] block: Release named dirty bitmaps in bdrv_close(), Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 15/50] block: Remove unused struct definition BlockFinishData, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 17/50] iotests: Add test for eject under NBD server, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 18/50] block: Add BB-BDS remove/insert notifiers, Max Reitz, 2016/02/02