mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-04 00:05:15 +00:00
Code Issues Releases Wiki Activity

daemon.at: Make changes for Windows.

Browse Source 
Skip some of the tests that uses '--monitor' as an option as
it is not implemented on Windows.

When a 'kill pid' is done on windows (through 'taskkill //F'),
pidfiles are not deleted (because it is force kill), so use
'ovs-appctl exit' instead.

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Gurucharan Shetty
2014-05-29 08:31:09 -07:00
parent 52a6bdafbd
commit fc28ea526c
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/daemon.at
View File

@@ -1,6 +1,7 @@
AT_BANNER([daemon unit tests - C]) AT_BANNER([daemon unit tests - C])
AT_SETUP([daemon]) AT_SETUP([daemon])
AT_SKIP_IF([test "$IS_WIN32" = "yes"])
OVSDB_INIT([db]) OVSDB_INIT([db])
AT_CAPTURE_FILE([pid]) AT_CAPTURE_FILE([pid])
AT_CAPTURE_FILE([expected]) AT_CAPTURE_FILE([expected])
@@ -19,6 +20,7 @@ AT_CHECK([test ! -e pid])
AT_CLEANUP AT_CLEANUP
AT_SETUP([daemon --monitor]) AT_SETUP([daemon --monitor])
AT_SKIP_IF([test "$IS_WIN32" = "yes"])
OVSDB_INIT([db]) OVSDB_INIT([db])
AT_CAPTURE_FILE([pid]) AT_CAPTURE_FILE([pid])
AT_CAPTURE_FILE([parent]) AT_CAPTURE_FILE([parent])
@@ -77,12 +79,20 @@ AT_CHECK([test -s pid])
AT_CHECK([kill -0 `cat pid`]) AT_CHECK([kill -0 `cat pid`])
# Kill the daemon and make sure that the pidfile gets deleted. # Kill the daemon and make sure that the pidfile gets deleted.
cp pid saved-pid cp pid saved-pid
kill `cat pid` if test "$IS_WIN32" = "yes"; then
# When a 'kill pid' is done on windows (through 'taskkill //F'),
# pidfiles are not deleted (because it is force kill), so use
# 'ovs-appctl exit' instead
ovs-appctl -t `pwd`/unixctl exit
else
kill `cat pid`
fi
OVS_WAIT_WHILE([kill -0 `cat saved-pid`]) OVS_WAIT_WHILE([kill -0 `cat saved-pid`])
AT_CHECK([test ! -e pid]) AT_CHECK([test ! -e pid])
AT_CLEANUP AT_CLEANUP
AT_SETUP([daemon --detach --monitor]) AT_SETUP([daemon --detach --monitor])
AT_SKIP_IF([test "$IS_WIN32" = "yes"])
m4_define([CHECK], m4_define([CHECK],
[AT_CHECK([$1], [$2], [$3], [$4], [kill `cat daemon monitor`])]) [AT_CHECK([$1], [$2], [$3], [$4], [kill `cat daemon monitor`])])
OVSDB_INIT([db]) OVSDB_INIT([db])
@@ -141,6 +151,7 @@ AT_CHECK([test ! -s pid])
AT_CLEANUP AT_CLEANUP
AT_SETUP([daemon --detach --monitor startup errors]) AT_SETUP([daemon --detach --monitor startup errors])
AT_SKIP_IF([test "$IS_WIN32" = "yes"])
AT_CAPTURE_FILE([pid]) AT_CAPTURE_FILE([pid])
OVSDB_INIT([db]) OVSDB_INIT([db])
AT_CHECK([ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --monitor --unixctl="`pwd`"/nonexistent/unixctl db], [1], [], [stderr]) AT_CHECK([ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --monitor --unixctl="`pwd`"/nonexistent/unixctl db], [1], [], [stderr])