diff options
| author |   Filip Tehlar <ftehlar@cisco.com> | 2016-09-07 15:47:47 +0200 |
|---|---|---|
| committer | Filip Tehlar <ftehlar@cisco.com> | 2016-09-12 14:41:10 +0200 |
| commit | bf231ba795387064e7c4f1781240619429a4ef29 (patch) | |
| tree | 86da34369910ca1c85672ed30d4374d4ecda9ac3 /tests/data_plane/vpp_lite_topo/test_driver/basic.sh | |
| parent | 1df1d674eaace35d52973786403eb1dbe3c0d5eb (diff) | |
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/<test_case>.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/<test_case>.sh
Change-Id: If851139cff072ba2e3b3594a3345763d360f3b59
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'tests/data_plane/vpp_lite_topo/test_driver/basic.sh')
| -rw-r--r-- | tests/data_plane/vpp_lite_topo/test_driver/basic.sh | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/tests/data_plane/vpp_lite_topo/test_driver/basic.sh b/tests/data_plane/vpp_lite_topo/test_driver/basic.sh index 77e3d14..cd10d4c 100644 --- a/tests/data_plane/vpp_lite_topo/test_driver/basic.sh +++ b/tests/data_plane/vpp_lite_topo/test_driver/basic.sh @@ -22,24 +22,13 @@ function test_basic basic_topo_setup fi - if [ "$3" == "wait" ] ; then - read -p "press any key to continue .." -n1 - fi - + maybe_pause test_result=1 ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}" - rc=$? - if [ $rc -ne 0 ] ; then - echo "No response received!" - basic_topo_clean - exit $test_result - fi - - if [ "$3" == "wait" ] ; then - read -p "press any key to continue .." -n1 - fi + assert_rc_ok $? basic_topo_clean "No ICMP response!" + maybe_pause # change IP addresses of destination RLOC echo "set int ip address del host-intervpp2 6.0.3.2/24" | nc 0 5003 echo "set int ip address host-intervpp2 6.0.3.20/24" | nc 0 5003 @@ -52,17 +41,8 @@ function test_basic # test done - if [ "$3" == "wait" ] ; then - read -p "press any key to continue .." -n1 - fi - + maybe_pause 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 } |