[ovs-dev] [PATCH 2/2] ovsdb-server.at: Relax "ovsdb-server combines updates" test

[Ben Pfaff]

On Fri, Apr 04, 2014 at 09:41:56PM +0900, YAMAMOTO Takashi wrote:
> Even without explicit ovsdb-client/block, the client might not
> run fast enough and some of updates might be combined.
> 
> Signed-off-by: YAMAMOTO Takashi <yamamoto at valinux.co.jp>

Hmm.  I'd really rather try to get all of the updates separately.

How about this instead?

diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
index 63111d1..934a126 100644
--- a/tests/ovsdb-server.at
+++ b/tests/ovsdb-server.at
@@ -758,9 +758,8 @@ for i in `seq 1 $n_iterations`; do
     trigger_big_update
 
     # Make sure that ovsdb-client gets enough CPU time to process the updates.
-    ovs-appctl -t ovsdb-client version > /dev/null
+    OVS_WAIT_UNTIL([grep "\"xyzzy$counter\"" ovsdb-client.out])
 done
-OVS_WAIT_UNTIL([grep "\"xyzzy$counter\"" ovsdb-client.out])
 AT_CHECK([ovs-appctl -t ovsdb-client exit])
 OVS_WAIT_WHILE([test -e ovsdb-client.pid])