Release Open vSwitch 1.0.2

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

diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at
index 4f179b6..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])], 
@@ -646,9 +593,6 @@ AT_CHECK([RUN_OVS_VSCTL([list interx x])],
 AT_CHECK([RUN_OVS_VSCTL([list b x])], 
   [1], [], [ovs-vsctl: no row "x" in table Bridge
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([list b br])], 
-  [1], [], [ovs-vsctl: multiple rows in Bridge match "br"
-], [OVS_VSCTL_CLEANUP])
 AT_CHECK([RUN_OVS_VSCTL([get b br0 d])], 
   [1], [], [ovs-vsctl: Bridge contains more than one column whose name matches "d"
 ], [OVS_VSCTL_CLEANUP])
@@ -724,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.
@@ -735,7 +685,7 @@ OVS_VSCTL_SETUP
 # Give the ovs-vsctls a chance to read the database
 sleep 1
 
-AT_CHECK([RUN_OVS_VSCTL([add-br br10 -- set bridge br1 other-config:abc=quux])
+AT_CHECK([RUN_OVS_VSCTL([add-br br10 -- set bridge br10 other-config:abc=quux])
 RUN_OVS_VSCTL([add-br br1 -- set bridge br1 other-config:abc=def -- add-bond br1 bond0 eth0 eth1 -- set port bond0 bond_updelay=500])],
   [0], [], [], [OVS_VSCTL_CLEANUP])
 
@@ -770,6 +720,7 @@ controller          : []
 datapath_id         : []
 datapath_type       : ""
 external_ids        : {}
+fail_mode           : []
 flood_vlans         : []
 mirrors             : []
 name                : "br0"