[test] let rpc server shutdown naturally

liujiandu · Feb 23, 2015 · 3f35981 · 3f35981
1 parent 9592638
commit 3f35981
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/tests/integration/check-rpc.sh b/tests/integration/check-rpc.sh
@@ -10,9 +10,8 @@ header "Check rpc replies get through on immediate shutdown"
 for (( k=0; k<25; k++ )); do
     port_name=/rpc/$$/$k
     ${YARP_BIN}/yarp rpcserver --stop --echo $port_name &
-    add_helper $!
     ${YARP_BIN}/yarp wait $port_name
     echo hello | ${YARP_BIN}/yarp rpc $port_name
-    cleanup_helper
+    wait_port_gone $port_name
 done
 
diff --git a/tests/integration/test-helper.sh b/tests/integration/test-helper.sh
@@ -171,6 +171,14 @@ function wait_topic_gone {
     done
 }
 
+function wait_port_gone {
+    port="$1"
+    while ${YARP_BIN}/yarp exists $port ; do
+	echo "waiting for $port to disappear"
+	sleep 1
+    done
+}
+
 function wait_node {
     node="$1"
     key="$2"