Catalli's threaded switch

[sliver-openvswitch.git] / tests / ovs-vsctl.at

diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at
index fa882b0..56fc1ce 100644 (file)
--- a/tests/ovs-vsctl.at
+++ b/tests/ovs-vsctl.at
@@ -360,76 +360,21 @@ OVS_VSCTL_SETUP
 AT_CHECK([RUN_OVS_VSCTL_TOGETHER(
   [add-br br0], 
 
-  [set-controller tcp:1.2.3.4],
-  [get-controller],
-  [get-controller default],
   [get-controller br0],
-
   [set-controller br0 tcp:4.5.6.7],
-  [get-controller],
-  [get-controller default],
-  [get-controller br0],
-
-  [del-controller],
-  [get-controller],
-  [get-controller default],
-  [get-controller br0],
-
-  [set-controller default tcp:8.9.10.11],
-  [get-controller],
-  [get-controller default],
-  [get-controller br0],
-
-  [del-controller default],
-  [get-controller],
-  [get-controller default],
   [get-controller br0],
 
   [del-controller br0],
-  [get-controller],
-  [get-controller default],
-  [get-controller br0],
-
-  [set-controller default tcp:1.2.3.4 tcp:4.5.6.7],
-  [get-controller],
-  [get-controller default],
   [get-controller br0],
 
   [set-controller br0 tcp:8.9.10.11 tcp:5.4.3.2],
-  [get-controller],
-  [get-controller default],
   [get-controller br0])], [0], [
 
-tcp:1.2.3.4
-tcp:1.2.3.4
-tcp:1.2.3.4
 
-tcp:1.2.3.4
-tcp:1.2.3.4
 tcp:4.5.6.7
 
 
 
-tcp:4.5.6.7
-
-tcp:8.9.10.11
-tcp:8.9.10.11
-tcp:4.5.6.7
-
-
-
-tcp:4.5.6.7
-
-
-
-
-
-tcp:1.2.3.4\ntcp:4.5.6.7
-tcp:1.2.3.4\ntcp:4.5.6.7
-tcp:1.2.3.4\ntcp:4.5.6.7
-
-tcp:1.2.3.4\ntcp:4.5.6.7
-tcp:1.2.3.4\ntcp:4.5.6.7
 tcp:5.4.3.2\ntcp:8.9.10.11
 ], [], [OVS_VSCTL_CLEANUP])
 OVS_VSCTL_CLEANUP
@@ -577,6 +522,7 @@ controller          : []
 datapath_id         : []
 datapath_type       : ""
 external_ids        : {}
+fail_mode           : []
 flood_vlans         : []
 mirrors             : []
 name                : "br0"
@@ -638,6 +584,7 @@ active_timeout      : 0
 add_id_to_interface : false
 engine_id           : []
 engine_type         : []
+external_ids        : {}
 targets             : ["1.2.3.4:567"]
 ]], [ignore], [test ! -e pid || kill `cat pid`])
 AT_CHECK([RUN_OVS_VSCTL([list interx x])], 
@@ -721,6 +668,12 @@ AT_CLEANUP
 
 AT_SETUP([database commands -- wait-until must wait])
 AT_KEYWORDS([ovs-vsctl])
+
+# Disable lcov for this test.  All the programs running in parallel
+# race badly on access to profiling data.
+DISABLE_LCOV=true
+export DISABLE_LCOV
+
 OVS_VSCTL_SETUP
 
 # Start ovs-vsctls in background.
@@ -767,6 +720,7 @@ controller          : []
 datapath_id         : []
 datapath_type       : ""
 external_ids        : {}
+fail_mode           : []
 flood_vlans         : []
 mirrors             : []
 name                : "br0"