From dc6dffbff996c2bb83bc116d9037adc47c1ab5cf Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 10 May 2024 22:07:27 +0000 Subject: [PATCH] test: case: bridge_*: Use standard ping tests --- test/case/infix_interfaces/bridge_basic.py | 14 ++------------ test/case/infix_interfaces/bridge_veth.py | 14 ++------------ test/case/infix_interfaces/bridge_vlan.py | 16 +++------------- test/case/infix_interfaces/dual_bridge.py | 14 ++------------ 4 files changed, 9 insertions(+), 49 deletions(-) diff --git a/test/case/infix_interfaces/bridge_basic.py b/test/case/infix_interfaces/bridge_basic.py index 37b4e693..62b5f222 100755 --- a/test/case/infix_interfaces/bridge_basic.py +++ b/test/case/infix_interfaces/bridge_basic.py @@ -46,17 +46,7 @@ with infamy.Test() as test: _, hport = env.ltop.xlate("host", "data") with infamy.IsolatedMacVlan(hport) as ns: - pingtest = ns.runsh(""" - set -ex - - ip link set iface up - ip addr add 10.0.0.1/24 dev iface - - ping -c1 -w5 10.0.0.2 || exit 1 - """) - - if pingtest.returncode: - print(pingtest.stdout) - test.fail() + ns.addip("10.0.0.1") + ns.must_reach("10.0.0.2") test.succeed() diff --git a/test/case/infix_interfaces/bridge_veth.py b/test/case/infix_interfaces/bridge_veth.py index b97771f8..8d5b7554 100755 --- a/test/case/infix_interfaces/bridge_veth.py +++ b/test/case/infix_interfaces/bridge_veth.py @@ -65,17 +65,7 @@ with infamy.Test() as test: _, hport = env.ltop.xlate("host", "data") with infamy.IsolatedMacVlan(hport) as ns: - pingtest = ns.runsh(""" - set -ex - - ip link set iface up - ip addr add 10.0.0.1/24 dev iface - - ping -c1 -w10 10.0.0.2 || exit 1 - """) - - if pingtest.returncode: - print(pingtest.stdout) - test.fail() + ns.addip("10.0.0.1") + ns.must_reach("10.0.0.2") test.succeed() diff --git a/test/case/infix_interfaces/bridge_vlan.py b/test/case/infix_interfaces/bridge_vlan.py index a17daee3..423788f3 100755 --- a/test/case/infix_interfaces/bridge_vlan.py +++ b/test/case/infix_interfaces/bridge_vlan.py @@ -117,18 +117,8 @@ with infamy.Test() as test: _, hport = env.ltop.xlate("host", "data1") with infamy.IsolatedMacVlan(hport) as ns: - pingtest = ns.runsh(""" - set -ex - - ip link set iface up - ip addr add 10.0.0.1/24 dev iface - - ping -c1 -w5 10.0.0.2 || exit 1 - ping -c1 -w5 10.0.0.3 || exit 1 - """) - - if pingtest.returncode: - print(pingtest.stdout) - test.fail() + ns.addip("10.0.0.1") + ns.must_reach("10.0.0.2") + ns.must_reach("10.0.0.3") test.succeed() diff --git a/test/case/infix_interfaces/dual_bridge.py b/test/case/infix_interfaces/dual_bridge.py index 889bc414..bb8ca184 100755 --- a/test/case/infix_interfaces/dual_bridge.py +++ b/test/case/infix_interfaces/dual_bridge.py @@ -73,17 +73,7 @@ with infamy.Test() as test: _, hport = env.ltop.xlate("host", "data") with infamy.IsolatedMacVlan(hport) as ns: - pingtest = ns.runsh(""" - set -ex - - ip link set iface up - ip addr add 10.0.0.1/24 dev iface - - ping -c1 -w10 10.0.0.2 || exit 1 - """) - - if pingtest.returncode: - print(pingtest.stdout) - test.fail() + ns.addip("10.0.0.1") + ns.must_reach("10.0.0.2") test.succeed()