From bf231ba795387064e7c4f1781240619429a4ef29 Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Wed, 7 Sep 2016 15:47:47 +0200 Subject: Introduce an option for testing binary API This patch introduces an option for choosing a configuration method in tests. Supported methods are VAT and vpp's debug CLI. * Added new aprameter to run.sh to define method (--cfg-method [vat|cli]). Defaults to vat. * When running a test separately the method can be set as follows: $ sudo CFG_METHOD=cli ./tests/.sh Again, it defaults to 'vat' if not provided. * Increased readability in test driver scripts when checking test status * When debugging you can stop test execution by running the test with WAIT=1: $ sudo WAIT=1 tests/.sh Change-Id: If851139cff072ba2e3b3594a3345763d360f3b59 Signed-off-by: Filip Tehlar --- .../test_driver/basic_multi_traffic.sh | 38 ++++------------------ 1 file changed, 7 insertions(+), 31 deletions(-) (limited to 'tests/data_plane/vpp_lite_topo/test_driver/basic_multi_traffic.sh') diff --git a/tests/data_plane/vpp_lite_topo/test_driver/basic_multi_traffic.sh b/tests/data_plane/vpp_lite_topo/test_driver/basic_multi_traffic.sh index 81fd0ff..79456b7 100644 --- a/tests/data_plane/vpp_lite_topo/test_driver/basic_multi_traffic.sh +++ b/tests/data_plane/vpp_lite_topo/test_driver/basic_multi_traffic.sh @@ -27,23 +27,13 @@ function test_basic_multi_traffic test_result=1 - if [ "$5" == "wait" ] ; then - read -p "press any key to continue .." -n1 - fi + maybe_pause ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}" - if [ $? -ne 0 ] ; then - echo "No response received!" - basic_topo_clean - exit $test_result - fi + assert_rc_ok $? basic_topo_clean "No response received!" ip netns exec vppns1 "${3}" -w 15 -c 1 "${4}" - if [ $? -ne 0 ] ; then - echo "No response received!" - basic_topo_clean - exit $test_result - fi + assert_rc_ok $? basic_topo_clean "No response received!" # change IP addresses of destination RLOC echo "set int ip address del host-intervpp2 6.0.3.2/24" | nc 0 5003 @@ -56,33 +46,19 @@ function test_basic_multi_traffic ODL_CONFIG_DIR=`pwd`/../configs/odl/basic/4o4 post_curl "update-mapping" ${ODL_CONFIG_FILE3} - if [ "$5" == "wait" ] ; then - read -p "press any key to continue .." -n1 - fi + maybe_pause ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}" - if [ $? -ne 0 ] ; then - echo "No response received!" - basic_topo_clean - exit $test_result - fi + assert_rc_ok $? basic_topo_clean "No response received!" ip netns exec vppns1 "${3}" -w 15 -c 1 "${4}" rc=$? - if [ "$5" == "wait" ] ; then - read -p "press any key to continue .." -n1 - fi + maybe_pause # test done - basic_topo_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 } -- cgit 1.2.3-korg