Extract ping and ping6 command execution so the return value can be
checked by the caller, this is needed for port isolation tests that are
intended to fail.

Signed-off-by: Nikolay Aleksandrov <niko...@cumulusnetworks.com>
---
 tools/testing/selftests/net/forwarding/lib.sh | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/net/forwarding/lib.sh 
b/tools/testing/selftests/net/forwarding/lib.sh
index e073918bbe15..2bb9cf303c53 100644
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -659,30 +659,40 @@ multipath_eval()
 ##############################################################################
 # Tests
 
-ping_test()
+ping_do()
 {
        local if_name=$1
        local dip=$2
        local vrf_name
 
-       RET=0
-
        vrf_name=$(master_name_get $if_name)
        ip vrf exec $vrf_name $PING $dip -c 10 -i 0.1 -w 2 &> /dev/null
+}
+
+ping_test()
+{
+       RET=0
+
+       ping_do $1 $2
        check_err $?
        log_test "ping"
 }
 
-ping6_test()
+ping6_do()
 {
        local if_name=$1
        local dip=$2
        local vrf_name
 
-       RET=0
-
        vrf_name=$(master_name_get $if_name)
        ip vrf exec $vrf_name $PING6 $dip -c 10 -i 0.1 -w 2 &> /dev/null
+}
+
+ping6_test()
+{
+       RET=0
+
+       ping6_do $1 $2
        check_err $?
        log_test "ping6"
 }
-- 
2.11.0

Reply via email to