Add statistics test

[one.git] / tests / data_plane / vpp_lite_topo / test_driver / rtr_two_iface.sh

diff --git a/tests/data_plane/vpp_lite_topo/test_driver/rtr_two_iface.sh b/tests/data_plane/vpp_lite_topo/test_driver/rtr_two_iface.sh
index ea5aa2c..a7d4a03 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/test_driver/rtr_two_iface.sh
+++ b/tests/data_plane/vpp_lite_topo/test_driver/rtr_two_iface.sh
@@ -20,38 +20,24 @@ fi
 function test_rtr_two_iface {
   rtr_two_iface_setup
 
-  if [ "$2" == "wait" ] ; then
-    read -p  "press any key to continue .." -n1
-  fi
+  maybe_pause
 
   test_result=1
   rc=0
 
   if [ "$1" != "${1#*[0-9].[0-9]}" ]; then
-    ip netns exec vpp1-ns ping -w 15 -c 1 "${1}"
+    ip netns exec vpp1-ns ping -w 20 -c 1 "${1}"
     rc=$?
   elif [ "$1" != "${1#*:[0-9a-fA-F]}" ]; then
-    ip netns exec vpp1-ns ping6 -w 15 -c 1 "${1}"
+    ip netns exec vpp1-ns ping6 -w 20 -c 1 "${1}"
     rc=$?
   else
     echo "Unrecognized IP format '$1'"
   fi
 
-  #ip netns exec vpp1-ns ping -w 15 -c 1 "${1}"
-  #rc=$?
-
-  if [ "$2" == "wait" ] ; then
-    read -p  "press any key to continue .." -n1
-  fi
+  maybe_pause
 
   rtr_two_iface_clean
-
-  if [ $rc -ne 0 ] ; then
-    echo "Test failed: No ICMP response received within specified timeout limit!"
-  else
-    echo "Test passed."
-    test_result=0
-  fi
-
+  print_status $rc "No ICMP response!"
   exit $test_result
 }