datapath-windows Release lock on HVUpdateNIC

[cascardo/ovs.git] / tests / kmod-macros.at

diff --git a/tests/kmod-macros.at b/tests/kmod-macros.at
index 95f0b06..5824940 100644 (file)
--- a/tests/kmod-macros.at
+++ b/tests/kmod-macros.at
@@ -9,6 +9,7 @@
 #
 m4_define([OVS_KMOD_VSWITCHD_START],
   [ AT_CHECK([modprobe openvswitch])
+    ON_EXIT([modprobe -r openvswitch])
    _OVS_VSWITCHD_START([])
    dnl Add bridges, ports, etc.
    AT_CHECK([ovs-vsctl -- add-br br0 -- set bridge br0 protocols=[[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15]] fail-mode=secure -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2])
@@ -52,6 +53,7 @@ m4_define([ADD_NAMESPACES],
    [m4_foreach([ns], [$@],
                [DEL_NAMESPACES(ns)
                 AT_CHECK([ip netns add ns])
+                ON_EXIT(DEL_NAMESPACES(ns))
                ])
    ]
 )