We already queue the removal of the kernel module in OVS_VSWITCHD_START,
via an ON_EXIT() call. This redundant removal also doesn't interact very
well with usage of vports: If the datapath still exists in the kernel,
we cannot remove a vport module; if we cannot remove a vport module, we
cannot remove the openvswitch module. Having the call here prevents
tunnel tests from manually cleaning up their datapath on exit, so this
patch removes it.

Signed-off-by: Joe Stringer <joestrin...@nicira.com>
---
 tests/kmod-macros.at | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/kmod-macros.at b/tests/kmod-macros.at
index eef1263..3487c67 100644
--- a/tests/kmod-macros.at
+++ b/tests/kmod-macros.at
@@ -32,7 +32,6 @@ m4_define([OVS_KMOD_VSWITCHD_STOP],
   [AT_CHECK([ovs-vsctl del-br br0])
    OVS_VSWITCHD_STOP([$1])
    AT_CHECK([:; $2])
-   AT_CHECK([modprobe -r openvswitch])
   ])
 
 # DEL_NAMESPACES(ns [, ns ... ])
-- 
2.1.4

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to