-AT_SETUP([daemon - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
-AT_CAPTURE_FILE([pid])
-AT_CAPTURE_FILE([expected])
-# Start the daemon and wait for the pidfile to get created
-# and that its contents are the correct pid.
-AT_CHECK([$PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/pid& echo $! > expected], [0])
-OVS_WAIT_UNTIL([test -s pid], [kill `cat expected`])
-AT_CHECK(
- [pid=`cat pid` && expected=`cat expected` && test "$pid" = "$expected"],
- [0], [], [], [kill `cat expected`])
-AT_CHECK([kill -0 `cat pid`], [0], [], [], [kill `cat expected`])
-# Kill the daemon and make sure that the pidfile gets deleted.
-kill `cat expected`
-OVS_WAIT_WHILE([kill -0 `cat expected`])
-AT_CHECK([test ! -e pid])
-AT_CLEANUP
-
-AT_SETUP([daemon --monitor - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
-AT_CAPTURE_FILE([pid])
-AT_CAPTURE_FILE([parent])
-AT_CAPTURE_FILE([parentpid])
-AT_CAPTURE_FILE([newpid])
-# Start the daemon and wait for the pidfile to get created.
-AT_CHECK([$PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/pid --monitor& echo $! > parent], [0])
-OVS_WAIT_UNTIL([test -s pid], [kill `cat parent`])
-# Check that the pidfile names a running process,
-# and that the parent process of that process is our child process.
-AT_CHECK([kill -0 `cat pid`], [0], [], [], [kill `cat parent`])
-AT_CHECK([ps -o ppid= -p `cat pid` > parentpid],
- [0], [], [], [kill `cat parent`])
-AT_CHECK(
- [parentpid=`cat parentpid` &&
- parent=`cat parent` &&
- test $parentpid = $parent],
- [0], [], [], [kill `cat parent`])
-# Kill the daemon process, making it look like a segfault,
-# and wait for a new child process to get spawned.
-AT_CHECK([cp pid oldpid], [0], [], [], [kill `cat parent`])
-AT_CHECK([kill -SEGV `cat pid`], [0], [], [ignore], [kill `cat parent`])
-OVS_WAIT_WHILE([kill -0 `cat oldpid`], [kill `cat parent`])
-OVS_WAIT_UNTIL([test -s pid && test `cat pid` != `cat oldpid`],
- [kill `cat parent`])
-AT_CHECK([cp pid newpid], [0], [], [], [kill `cat parent`])
-# Check that the pidfile names a running process,
-# and that the parent process of that process is our child process.
-AT_CHECK([ps -o ppid= -p `cat pid` > parentpid],
- [0], [], [], [kill `cat parent`])
-AT_CHECK(
- [parentpid=`cat parentpid` &&
- parent=`cat parent` &&
- test $parentpid = $parent],
- [0], [], [], [kill `cat parent`])
-# Kill the daemon process with SIGTERM, and wait for the daemon
-# and the monitor processes to go away and the pidfile to get deleted.
-AT_CHECK([kill `cat pid`], [0], [], [ignore], [kill `cat parent`])
-OVS_WAIT_WHILE([kill -0 `cat parent` || kill -0 `cat newpid` || test -e pid],
- [kill `cat parent`])
-AT_CLEANUP
-
-AT_SETUP([daemon --monitor restart exit code - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
-AT_CAPTURE_FILE([pid])
-AT_CAPTURE_FILE([parent])
-AT_CAPTURE_FILE([parentpid])
-AT_CAPTURE_FILE([newpid])
-# Start the daemon and wait for the pidfile to get created.
-AT_CHECK([$PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/pid --monitor& echo $! > parent], [0])
-OVS_WAIT_UNTIL([test -s pid], [kill `cat parent`])
-# Check that the pidfile names a running process,
-# and that the parent process of that process is our child process.
-AT_CHECK([kill -0 `cat pid`], [0], [], [], [kill `cat parent`])
-AT_CHECK([ps -o ppid= -p `cat pid` > parentpid],
- [0], [], [], [kill `cat parent`])
-AT_CHECK(
- [parentpid=`cat parentpid` &&
- parent=`cat parent` &&
- test $parentpid = $parent],
- [0], [], [], [kill `cat parent`])
-# HUP the daemon process causing it to throw an exception,
-# and wait for a new child process to get spawned.
-AT_CHECK([cp pid oldpid], [0], [], [], [kill `cat parent`])
-AT_CHECK([kill -HUP `cat pid`], [0], [], [ignore], [kill `cat parent`])
-OVS_WAIT_WHILE([kill -0 `cat oldpid`], [kill `cat parent`])
-OVS_WAIT_UNTIL([test -s pid && test `cat pid` != `cat oldpid`],
- [kill `cat parent`])
-AT_CHECK([cp pid newpid], [0], [], [], [kill `cat parent`])
-# Check that the pidfile names a running process,
-# and that the parent process of that process is our child process.
-AT_CHECK([ps -o ppid= -p `cat pid` > parentpid],
- [0], [], [], [kill `cat parent`])
-AT_CHECK(
- [parentpid=`cat parentpid` &&
- parent=`cat parent` &&
- test $parentpid = $parent],
- [0], [], [], [kill `cat parent`])
-# Kill the daemon process with SIGTERM, and wait for the daemon
-# and the monitor processes to go away and the pidfile to get deleted.
-AT_CHECK([kill `cat pid`], [0], [], [ignore], [kill `cat parent`])
-OVS_WAIT_WHILE([kill -0 `cat parent` || kill -0 `cat newpid` || test -e pid],
- [kill `cat parent`])
-AT_CLEANUP
-
-AT_SETUP([daemon --detach - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
-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
-# supposed to do so before the parent exits.
-AT_CHECK([$PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/pid --detach], [0])
-AT_CHECK([test -s pid])
-AT_CHECK([kill -0 `cat pid`])
-# Kill the daemon and make sure that the pidfile gets deleted.
-cp pid saved-pid
-kill `cat pid`
-OVS_WAIT_WHILE([kill -0 `cat saved-pid`])
-AT_CHECK([test ! -e pid])
-AT_CLEANUP
-
-AT_SETUP([daemon --detach --monitor - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+m4_define([DAEMON_PYN],
+ [AT_SETUP([daemon - $1])
+ AT_SKIP_IF([test $2 = no])
+ AT_KEYWORDS([python daemon])
+ AT_CAPTURE_FILE([pid])
+ AT_CAPTURE_FILE([expected])
+ # Start the daemon and wait for the pidfile to get created
+ # and that its contents are the correct pid.
+ AT_CHECK([$3 $srcdir/test-daemon.py --pidfile=`pwd`/pid& echo $! > expected], [0])
+ OVS_WAIT_UNTIL([test -s pid], [kill `cat expected`])
+ AT_CHECK(
+ [pid=`cat pid` && expected=`cat expected` && test "$pid" = "$expected"],
+ [0], [], [], [kill `cat expected`])
+ AT_CHECK([kill -0 `cat pid`], [0], [], [], [kill `cat expected`])
+ # Kill the daemon and make sure that the pidfile gets deleted.
+ kill `cat expected`
+ OVS_WAIT_WHILE([kill -0 `cat expected`])
+ AT_CHECK([test ! -e pid])
+ AT_CLEANUP])
+
+DAEMON_PYN([Python2], [$HAVE_PYTHON], [$PYTHON])
+DAEMON_PYN([Python3], [$HAVE_PYTHON3], [$PYTHON3])
+
+m4_define([DAEMON_MONITOR_PYN],
+ [AT_SETUP([daemon --monitor - $1])
+ AT_SKIP_IF([test $2 = no])
+ AT_CAPTURE_FILE([pid])
+ AT_CAPTURE_FILE([parent])
+ AT_CAPTURE_FILE([parentpid])
+ AT_CAPTURE_FILE([newpid])
+ # Start the daemon and wait for the pidfile to get created.
+ AT_CHECK([$3 $srcdir/test-daemon.py --pidfile=`pwd`/pid --monitor& echo $! > parent], [0])
+ OVS_WAIT_UNTIL([test -s pid], [kill `cat parent`])
+ # Check that the pidfile names a running process,
+ # and that the parent process of that process is our child process.
+ AT_CHECK([kill -0 `cat pid`], [0], [], [], [kill `cat parent`])
+ AT_CHECK([ps -o ppid= -p `cat pid` > parentpid],
+ [0], [], [], [kill `cat parent`])
+ AT_CHECK(
+ [parentpid=`cat parentpid` &&
+ parent=`cat parent` &&
+ test $parentpid = $parent],
+ [0], [], [], [kill `cat parent`])
+ # Kill the daemon process, making it look like a segfault,
+ # and wait for a new child process to get spawned.
+ AT_CHECK([cp pid oldpid], [0], [], [], [kill `cat parent`])
+ AT_CHECK([kill -SEGV `cat pid`], [0], [], [ignore], [kill `cat parent`])
+ OVS_WAIT_WHILE([kill -0 `cat oldpid`], [kill `cat parent`])
+ OVS_WAIT_UNTIL([test -s pid && test `cat pid` != `cat oldpid`],
+ [kill `cat parent`])
+ AT_CHECK([cp pid newpid], [0], [], [], [kill `cat parent`])
+ # Check that the pidfile names a running process,
+ # and that the parent process of that process is our child process.
+ AT_CHECK([ps -o ppid= -p `cat pid` > parentpid],
+ [0], [], [], [kill `cat parent`])
+ AT_CHECK(
+ [parentpid=`cat parentpid` &&
+ parent=`cat parent` &&
+ test $parentpid = $parent],
+ [0], [], [], [kill `cat parent`])
+ # Kill the daemon process with SIGTERM, and wait for the daemon
+ # and the monitor processes to go away and the pidfile to get deleted.
+ AT_CHECK([kill `cat pid`], [0], [], [ignore], [kill `cat parent`])
+ OVS_WAIT_WHILE([kill -0 `cat parent` || kill -0 `cat newpid` || test -e pid],
+ [kill `cat parent`])
+ AT_CLEANUP])
+
+DAEMON_MONITOR_PYN([Python2], [$HAVE_PYTHON], [$PYTHON])
+DAEMON_MONITOR_PYN([Python3], [$HAVE_PYTHON3], [$PYTHON3])
+
+m4_define([DAEMON_MONITOR_RESTART_PYN],
+ [AT_SETUP([daemon --monitor restart exit code - $1])
+ AT_SKIP_IF([test $2 = no])
+ AT_CAPTURE_FILE([pid])
+ AT_CAPTURE_FILE([parent])
+ AT_CAPTURE_FILE([parentpid])
+ AT_CAPTURE_FILE([newpid])
+ # Start the daemon and wait for the pidfile to get created.
+ AT_CHECK([$3 $srcdir/test-daemon.py --pidfile=`pwd`/pid --monitor& echo $! > parent], [0])
+ OVS_WAIT_UNTIL([test -s pid], [kill `cat parent`])
+ # Check that the pidfile names a running process,
+ # and that the parent process of that process is our child process.
+ AT_CHECK([kill -0 `cat pid`], [0], [], [], [kill `cat parent`])
+ AT_CHECK([ps -o ppid= -p `cat pid` > parentpid],
+ [0], [], [], [kill `cat parent`])
+ AT_CHECK(
+ [parentpid=`cat parentpid` &&
+ parent=`cat parent` &&
+ test $parentpid = $parent],
+ [0], [], [], [kill `cat parent`])
+ # HUP the daemon process causing it to throw an exception,
+ # and wait for a new child process to get spawned.
+ AT_CHECK([cp pid oldpid], [0], [], [], [kill `cat parent`])
+ AT_CHECK([kill -HUP `cat pid`], [0], [], [ignore], [kill `cat parent`])
+ OVS_WAIT_WHILE([kill -0 `cat oldpid`], [kill `cat parent`])
+ OVS_WAIT_UNTIL([test -s pid && test `cat pid` != `cat oldpid`],
+ [kill `cat parent`])
+ AT_CHECK([cp pid newpid], [0], [], [], [kill `cat parent`])
+ # Check that the pidfile names a running process,
+ # and that the parent process of that process is our child process.
+ AT_CHECK([ps -o ppid= -p `cat pid` > parentpid],
+ [0], [], [], [kill `cat parent`])
+ AT_CHECK(
+ [parentpid=`cat parentpid` &&
+ parent=`cat parent` &&
+ test $parentpid = $parent],
+ [0], [], [], [kill `cat parent`])
+ # Kill the daemon process with SIGTERM, and wait for the daemon
+ # and the monitor processes to go away and the pidfile to get deleted.
+ AT_CHECK([kill `cat pid`], [0], [], [ignore], [kill `cat parent`])
+ OVS_WAIT_WHILE([kill -0 `cat parent` || kill -0 `cat newpid` || test -e pid],
+ [kill `cat parent`])
+ AT_CLEANUP])
+
+DAEMON_MONITOR_RESTART_PYN([Python2], [$HAVE_PYTHON], [$PYTHON])
+DAEMON_MONITOR_RESTART_PYN([Python3], [$HAVE_PYTHON3], [$PYTHON3])
+
+m4_define([DAEMON_DETACH_PYN],
+ [AT_SETUP([daemon --detach - $1])
+ AT_SKIP_IF([test $2 = no])
+ 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
+ # supposed to do so before the parent exits.
+ AT_CHECK([$3 $srcdir/test-daemon.py --pidfile=`pwd`/pid --detach], [0])
+ AT_CHECK([test -s pid])
+ AT_CHECK([kill -0 `cat pid`])
+ # Kill the daemon and make sure that the pidfile gets deleted.
+ cp pid saved-pid
+ kill `cat pid`
+ OVS_WAIT_WHILE([kill -0 `cat saved-pid`])
+ AT_CHECK([test ! -e pid])
+ AT_CLEANUP])
+
+DAEMON_DETACH_PYN([Python2], [$HAVE_PYTHON], [$PYTHON])
+DAEMON_DETACH_PYN([Python3], [$HAVE_PYTHON3], [$PYTHON3])
+