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/two_customers_topo.sh | 27 ++++------------------ 1 file changed, 5 insertions(+), 22 deletions(-) (limited to 'tests/data_plane/vpp_lite_topo/test_driver/two_customers_topo.sh') diff --git a/tests/data_plane/vpp_lite_topo/test_driver/two_customers_topo.sh b/tests/data_plane/vpp_lite_topo/test_driver/two_customers_topo.sh index 9a5755f..84c8d96 100644 --- a/tests/data_plane/vpp_lite_topo/test_driver/two_customers_topo.sh +++ b/tests/data_plane/vpp_lite_topo/test_driver/two_customers_topo.sh @@ -23,36 +23,19 @@ function test_eid_virtualization { # init to test failed test_result=1 - if [ "$3" == "wait" ] ; then - read -p "press any key to continue .." -n1 - fi + maybe_pause ip netns exec vpp1-cus1-ns "${1}" -w 20 -c 1 "${2}" - rc=$? - if [ $rc -ne 0 ] ; then - echo "Error: customer 1 did not receive any response!" - fi + assert_rc_ok $? two_customers_topo_clean "No response!" - #read -p "press any key to continue .." -n1 + maybe_pause ip netns exec vpp1-cus2-ns "${1}" -w 20 -c 1 "${2}" rc=$? - if [ $rc -ne 0 ] ; then - echo "Error: customer 2 did not receive any response!" - fi - if [ "$3" == "wait" ] ; then - read -p "press any key to continue .." -n1 - fi + maybe_pause two_customers_topo_clean - - if [ $rc -ne 0 ] ; then - echo "Test failed!"; - else - echo "Test passed." - test_result=0 - fi - + print_status $rc "No ICMP response!" exit $test_result } -- cgit 1.2.3-korg