[ovs-dev] [PATCH 10/16] daemon-py.at: Skip tests for Windows.

Gurucharan Shetty shettyg at nicira.com
Fri May 30 19:06:18 UTC 2014


Python daemon functions haven't been ported for Windows. As of now,
there is no use for it on Windows. If such a use case comes up,
we will have to port them. Till then don't run those tests on
Windows.

Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
---
 tests/daemon-py.at |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/daemon-py.at b/tests/daemon-py.at
index cafa8df..a87e833 100644
--- a/tests/daemon-py.at
+++ b/tests/daemon-py.at
@@ -1,7 +1,7 @@
 AT_BANNER([daemon unit tests - Python])
 
 AT_SETUP([daemon - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([test $HAVE_PYTHON = no || test "$IS_WIN32" = "yes"])
 AT_CAPTURE_FILE([pid])
 AT_CAPTURE_FILE([expected])
 # Start the daemon and wait for the pidfile to get created
@@ -19,7 +19,7 @@ AT_CHECK([test ! -e pid])
 AT_CLEANUP
 
 AT_SETUP([daemon --monitor - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([test $HAVE_PYTHON = no || test "$IS_WIN32" = "yes"])
 AT_CAPTURE_FILE([pid])
 AT_CAPTURE_FILE([parent])
 AT_CAPTURE_FILE([parentpid])
@@ -62,7 +62,7 @@ OVS_WAIT_WHILE([kill -0 `cat parent` || kill -0 `cat newpid` || test -e pid],
 AT_CLEANUP
 
 AT_SETUP([daemon --monitor restart exit code - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([test $HAVE_PYTHON = no || test "$IS_WIN32" = "yes"])
 AT_CAPTURE_FILE([pid])
 AT_CAPTURE_FILE([parent])
 AT_CAPTURE_FILE([parentpid])
@@ -105,7 +105,7 @@ OVS_WAIT_WHILE([kill -0 `cat parent` || kill -0 `cat newpid` || test -e pid],
 AT_CLEANUP
 
 AT_SETUP([daemon --detach - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([test $HAVE_PYTHON = no || test "$IS_WIN32" = "yes"])
 AT_CAPTURE_FILE([pid])
 # Start the daemon and make sure that the pidfile exists immediately.
 # We don't wait for the pidfile to get created because the daemon is
@@ -121,7 +121,7 @@ AT_CHECK([test ! -e pid])
 AT_CLEANUP
 
 AT_SETUP([daemon --detach --monitor - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([test $HAVE_PYTHON = no || test "$IS_WIN32" = "yes"])
 m4_define([CHECK],
   [AT_CHECK([$1], [$2], [$3], [$4], [kill `cat daemon monitor`])])
 AT_CAPTURE_FILE([daemon])
@@ -170,7 +170,7 @@ m4_undefine([CHECK])
 AT_CLEANUP
 
 AT_SETUP([daemon --detach startup errors - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([test $HAVE_PYTHON = no || test "$IS_WIN32" = "yes"])
 AT_CAPTURE_FILE([pid])
 AT_CHECK([$PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/pid --detach --bail], [1], [], [stderr])
 AT_CHECK([grep 'test-daemon.py: exiting after daemonize_start() as requested' stderr],
@@ -179,7 +179,7 @@ AT_CHECK([test ! -s pid])
 AT_CLEANUP
 
 AT_SETUP([daemon --detach --monitor startup errors - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([test $HAVE_PYTHON = no || test "$IS_WIN32" = "yes"])
 AT_CAPTURE_FILE([pid])
 AT_CHECK([$PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/pid --detach --monitor --bail], [1], [], [stderr])
 AT_CHECK([grep 'test-daemon.py: exiting after daemonize_start() as requested' stderr],
@@ -188,7 +188,7 @@ AT_CHECK([test ! -s pid])
 AT_CLEANUP
 
 AT_SETUP([daemon --detach closes standard fds - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([test $HAVE_PYTHON = no || test "$IS_WIN32" = "yes"])
 AT_CAPTURE_FILE([pid])
 AT_CAPTURE_FILE([status])
 AT_CAPTURE_FILE([stderr])
@@ -208,7 +208,7 @@ fi
 AT_CLEANUP
 
 AT_SETUP([daemon --detach --monitor closes standard fds])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([test $HAVE_PYTHON = no || test "$IS_WIN32" = "yes"])
 AT_CAPTURE_FILE([pid])
 AT_CAPTURE_FILE([status])
 AT_CAPTURE_FILE([stderr])
-- 
1.7.9.5




More information about the dev mailing list