From: Alin Serdean Date: Mon, 22 Jun 2015 22:45:18 +0000 (+0000) Subject: tests: Remove the windows service in case it failed to start X-Git-Tag: v2.5.0~1037 X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=8164a704077581292b4a76d6523604a1c6c440e8 tests: Remove the windows service in case it failed to start In case the ovsdb-server failed to start, the defined service was not properly cleaned. Add a run-if-false command in case the service failed to start. Signed-off-by: Alin Gabriel Serdean Signed-off-by: Gurucharan Shetty --- diff --git a/tests/daemon.at b/tests/daemon.at index dd7a3f40e..51d56c544 100644 --- a/tests/daemon.at +++ b/tests/daemon.at @@ -172,7 +172,7 @@ 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]) OVS_WAIT_UNTIL([sc query ovsdb-server | grep STATE | grep RUNNING > /dev/null 2>&1]) AT_CHECK([kill -0 `cat pid`], [0], [ignore])