Commit 05d0fce4 authored by Max Reitz's avatar Max Reitz
Browse files

iotests: Rename filter_nbd to _filter_nbd in 083 



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: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent d3780c2d

tests/qemu-iotests/083

+2 −2
Original line number Diff line number Diff line
@@ -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

}