X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovsdb-monitor.at;h=f0b20e155f9756a99f965d195e93d6d4e447436f;hb=96d2ee8e314fb95a0066db50c5af585aef1700c3;hp=e57f41a0b139bbb93b75900712d38daaf2c0b908;hpb=8fcf509ed6d66592553df26c3e942b6afa39472b;p=openvswitch

diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at
index e57f41a0..f0b20e15 100644
--- a/tests/ovsdb-monitor.at
+++ b/tests/ovsdb-monitor.at
@@ -23,15 +23,17 @@ m4_define([OVSDB_CHECK_MONITOR],
    OVS_CHECK_LCOV([ovsdb-tool create db schema], [0], [stdout], [ignore])
    m4_foreach([txn], [$3],
      [OVS_CHECK_LCOV([ovsdb-tool transact db 'txn'], [0], [ignore], [ignore])])
-   AT_CHECK([ovsdb-server --detach --pidfile=$PWD/server-pid --listen=punix:socket --unixctl=$PWD/unixctl db])
-   AT_CHECK([ovsdb-client monitor --format=csv unix:socket $4 > output & echo $! > monitor-pid], 
+   AT_CHECK([ovsdb-server --detach --pidfile=$PWD/server-pid --listen=punix:socket --unixctl=$PWD/unixctl db], [0], [ignore], [ignore])
+   AT_CHECK([ovsdb-client --detach --pidfile=$PWD/client-pid monitor --format=csv unix:socket $4 > output], 
             [0], [ignore], [ignore], [kill `cat server-pid`])
    m4_foreach([txn], [$5],
      [OVS_CHECK_LCOV([ovsdb-client transact unix:socket 'txn'], [0],
-                     [ignore], [ignore], [kill `cat server-pid monitor-pid`])])
+                     [ignore], [ignore], [kill `cat server-pid client-pid`])])
+   OVS_CHECK_LCOV([ovsdb-client transact unix:socket '[[]]'], [0],
+                  [ignore], [ignore], [kill `cat server-pid client-pid`])
    AT_CHECK([ovs-appctl -t $PWD/unixctl -e exit], [0], [ignore], [ignore])
-   wait
-   AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$6])
+   OVS_WAIT_UNTIL([test ! -e server-pid && test ! -e client-pid && exit 0])
+   AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$6], [ignore])
    AT_CLEANUP])
 
 OVSDB_CHECK_MONITOR([monitor insert into empty table],