X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovsdb-server.at;h=86179bdf9a83ca9412a6096c764ddf264ab6843c;hb=0ef165ecb57943e17a8ee8270df68ffb8d032e29;hp=fc51820a11442a5d7965024d406b3c41a4c1d66a;hpb=906e29329b211a7f1c1ec457de2d32f429387793;p=sliver-openvswitch.git

diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
index fc51820a1..86179bdf9 100644
--- a/tests/ovsdb-server.at
+++ b/tests/ovsdb-server.at
@@ -194,9 +194,8 @@ AT_CHECK([ovsdb-client list-tables unix:socket constraints], [0], [ignore], [ign
 AT_CHECK([ovsdb-client list-tables unix:socket ordinals], [0], [ignore], [ignore])
 
 # Add an already added database.
-AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/add-db db2], 2, [], [stderr])
-AT_CHECK([sed 's/(.*)/(...)/' stderr], [0],
-  [I/O error: db2: failed to lock lockfile (...)
+AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/add-db db2], 2, [],
+  [db2: already open
 ovs-appctl: ovsdb-server: server returned an error
 ])
 
@@ -685,9 +684,12 @@ fi
 # Calculate the number of iterations we need to queue.  Each of the
 # iterations we execute, by itself, yields a monitor update of about
 # 25 kB, so fill up that much space plus a few for luck.
-n_iterations=`expr $rmem_max / 2500 + 5`
+n_iterations=`expr $rmem_max / 25000 + 5`
 echo rmem_max=$rmem_max n_iterations=$n_iterations
 
+# If there's too much queuing skip the test to avoid timing out.
+AT_SKIP_IF([test $rmem_max -gt 1048576])
+
 # Calculate the exact number of monitor updates expected for $n_iterations,
 # assuming no updates are combined.  The "extra" update is for the initial
 # contents of the database.