X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fdaemon-py.at;h=cafa8dfe22f55e699b7336a52fa513718822bcbd;hb=0ef165ecb57943e17a8ee8270df68ffb8d032e29;hp=39ab3ccd3898f40a283ed6395619540e8dd05944;hpb=b153e667907ed68164a15207ad5f91ad4c39927c;p=sliver-openvswitch.git diff --git a/tests/daemon-py.at b/tests/daemon-py.at index 39ab3ccd3..cafa8dfe2 100644 --- a/tests/daemon-py.at +++ b/tests/daemon-py.at @@ -142,7 +142,7 @@ CHECK([kill -0 `cat daemon`]) CHECK([ps -o ppid= -p `cat daemon` > monitor]) CHECK([kill -0 `cat monitor`]) CHECK([ps -o ppid= -p `cat monitor` > init]) -CHECK([test `cat init` = 1]) +CHECK([test `cat init` != $$]) # Kill the daemon process, making it look like a segfault, # and wait for a new daemon process to get spawned. CHECK([cp daemon olddaemon]) @@ -159,7 +159,7 @@ CHECK([ps -o ppid= -p `cat daemon` > newmonitor]) CHECK([diff monitor newmonitor]) CHECK([kill -0 `cat newmonitor`]) CHECK([ps -o ppid= -p `cat newmonitor` > init]) -CHECK([test `cat init` = 1]) +CHECK([test `cat init` != $$]) # Kill the daemon process with SIGTERM, and wait for the daemon # and the monitor processes to go away and the pidfile to get deleted. CHECK([kill `cat daemon`], [0], [], [ignore]) @@ -208,6 +208,7 @@ fi AT_CLEANUP AT_SETUP([daemon --detach --monitor closes standard fds]) +AT_SKIP_IF([test $HAVE_PYTHON = no]) AT_CAPTURE_FILE([pid]) AT_CAPTURE_FILE([status]) AT_CAPTURE_FILE([stderr])