qemu-iotests: tests: do not set unused tmp variable

[qemu.git] / tests / qemu-iotests / 083

diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083
index f764534782a01eb547b60d6d6970602e901f354f..bc724ae05889984eb5f47c27ba2be77df3799904 100755 (executable)
--- a/tests/qemu-iotests/083
+++ b/tests/qemu-iotests/083
@@ -25,7 +25,6 @@ seq=`basename $0`
 echo "QA output created by $seq"
 
 here=`pwd`
-tmp=/tmp/$$
 status=1       # failure is the default!
 
 # get standard environment, filters and checks
@@ -44,21 +43,11 @@ choose_tcp_port() {
 
 wait_for_tcp_port() {
        while ! (netstat --tcp --listening --numeric | \
-                grep "$1.*0.0.0.0:\*.*LISTEN") 2>&1 >/dev/null; do
+                grep "$1.*0\\.0\\.0\\.0:\\*.*LISTEN") 2>&1 >/dev/null; do
                sleep 0.1
        done
 }
 
-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.
-       #
-       # Filter out the TCP port number since this changes between runs.
-       sed -e 's#^nbd.c:.*##g' \
-           -e 's#nbd:127.0.0.1:[^:]*:#nbd:127.0.0.1:PORT:#g'
-}
-
 check_disconnect() {
        event=$1
        when=$2
@@ -81,9 +70,9 @@ EOF
                nbd_url="nbd:127.0.0.1:$port:exportname=foo"
        fi
 
-       ./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
+       $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
 
        echo
 }