X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=tests%2Fdaemon.at;h=51d56c544a0a908d9c754ef05bff7824b0514e00;hb=d0a46cb4608e632f5028034762f0adde2ce947a0;hp=4a6f341a615baa701f07df771e6f8649b38e5f05;hpb=02a514ef712534b53ca315bf9c7b091229425076;p=cascardo%2Fovs.git

diff --git a/tests/daemon.at b/tests/daemon.at
index 4a6f341a6..51d56c544 100644
--- a/tests/daemon.at
+++ b/tests/daemon.at
@@ -161,6 +161,7 @@ AT_CHECK([test ! -s pid])
 AT_CLEANUP
 
 AT_SETUP([daemon --service])
+AT_KEYWORDS([windows-service])
 AT_SKIP_IF([test "$IS_WIN32" != "yes"])
 OVSDB_INIT([db])
 AT_CAPTURE_FILE([pid])
@@ -171,9 +172,9 @@ AT_CHECK([sc create ovsdb-server binpath="$abs_path/ovsdb-server `pwd`/db --log-
 [0], [[[SC]] CreateService SUCCESS
 ])
 
-AT_CHECK([sc start ovsdb-server], [0], [ignore])
+AT_CHECK([sc start ovsdb-server], [0], [ignore], [ignore], [sc delete ovsdb-server])
 OVS_WAIT_UNTIL([test -s pid])
-AT_CHECK([sc query ovsdb-server | grep STATE | grep RUNNING], [0], [ignore])
+OVS_WAIT_UNTIL([sc query ovsdb-server | grep STATE | grep RUNNING > /dev/null 2>&1])
 AT_CHECK([kill -0 `cat pid`], [0], [ignore])
 AT_CHECK([ovs-appctl -t `pwd`/unixctl ovsdb-server/list-dbs], [0],
 [Open_vSwitch