[ovs-dev] [PATCH 1/4] system-common-macros: clean up veth device on test failure

Mark Gray mark.d.gray at redhat.com
Mon Mar 8 17:57:33 UTC 2021


'on_exit' should be run directly after creation
of veth device.

Fixes: 119db2cb18a7 ("kmod-macros: Move some code to traffic-common-macros.")
Signed-off-by: Mark Gray <mark.d.gray at redhat.com>
---
 tests/system-common-macros.at | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at
index 9d5e24a2922b..19a0b125b973 100644
--- a/tests/system-common-macros.at
+++ b/tests/system-common-macros.at
@@ -72,6 +72,7 @@ m4_define([ADD_INT],
 #
 m4_define([ADD_VETH],
     [ AT_CHECK([ip link add $1 type veth peer name ovs-$1 || return 77])
+      on_exit 'ip link del ovs-$1'
       CONFIGURE_VETH_OFFLOADS([$1])
       AT_CHECK([ip link set $1 netns $2])
       AT_CHECK([ip link set dev ovs-$1 up])
@@ -85,7 +86,6 @@ m4_define([ADD_VETH],
       if test -n "$6"; then
         NS_CHECK_EXEC([$2], [ip route add default via $6])
       fi
-      on_exit 'ip link del ovs-$1'
     ]
 )
 
-- 
2.27.0



More information about the dev mailing list