[ovs-dev] [PATCH V2 09/16] python tests: Don't check if the PID file gets deleted

[Paul Boca]

On Windows the PID file doesn't gets deleted on process exit.

Signed-off-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>
---
V2: Skip pid file check in ovsdb-monitor.at also
---
 tests/daemon-py.at     | 8 ++++++--
 tests/ovsdb-monitor.at | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/daemon-py.at b/tests/daemon-py.at
index e59c11d..7578622 100644
--- a/tests/daemon-py.at
+++ b/tests/daemon-py.at
@@ -197,7 +197,9 @@ m4_define([DAEMON_DETACH_ERRORS_PYN],
    AT_CHECK([$3 $srcdir/test-daemon.py --pidfile=`pwd`/pid --detach --bail], [1], [], [stderr])
    AT_CHECK([grep 'test-daemon.py: exiting after daemonize_start() as requested' stderr],
      [0], [ignore], [])
-   AT_CHECK([test ! -s pid])
+   if test "$IS_WIN32" != "yes"; then
+     AT_CHECK([test ! -s pid])
+   fi
    AT_CLEANUP])
 
 DAEMON_DETACH_ERRORS_PYN([Python2], [$HAVE_PYTHON], [$PYTHON])
@@ -210,7 +212,9 @@ m4_define([DAEMON_DETACH_MONITOR_ERRORS_PYN],
    AT_CHECK([$3 $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],
      [0], [ignore], [])
-   AT_CHECK([test ! -s pid])
+   if test "$IS_WIN32" != "yes"; then
+     AT_CHECK([test ! -s pid])
+   fi
    AT_CLEANUP])
 
 DAEMON_DETACH_MONITOR_ERRORS_PYN([Python2], [$HAVE_PYTHON], [$PYTHON])
diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at
index 37383fa..06119ba 100644
--- a/tests/ovsdb-monitor.at
+++ b/tests/ovsdb-monitor.at
@@ -40,7 +40,9 @@ m4_define([OVSDB_CHECK_MONITOR],
    AT_CHECK([ovsdb-client transact unix:socket '[["$4"]]'], [0],
             [ignore], [ignore], [kill `cat server-pid client-pid`])
    OVS_APP_EXIT_AND_WAIT(["`pwd`"/unixctl])
-   OVS_WAIT_UNTIL([test ! -e client-pid])
+   if test "$IS_WIN32" != "yes"; then
+     OVS_WAIT_UNTIL([test ! -e client-pid])
+   fi
    AT_CHECK([${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl], [0], [$7], [ignore])
    AT_CLEANUP])
 
-- 
2.7.2.windows.1