From: Ethan Jackson Date: Thu, 23 Sep 2010 05:48:42 +0000 (-0700) Subject: tests: Remove trailing whitespace from python daemon tests X-Git-Tag: v1.1.0~1071 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9c64f2384d850658985d7e18003443c196e89ae1;p=sliver-openvswitch.git tests: Remove trailing whitespace from python daemon tests Removes the trailing whitespace from the testing code related to daemonizing in Python. --- diff --git a/tests/daemon-py.at b/tests/daemon-py.at index 7ff376eb7..9e5f2793b 100644 --- a/tests/daemon-py.at +++ b/tests/daemon-py.at @@ -33,8 +33,8 @@ 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` && + [parentpid=`cat parentpid` && + parent=`cat parent` && test $parentpid = $parent], [0], [], [], [kill `cat parent`]) # Kill the daemon process, making it look like a segfault, @@ -50,8 +50,8 @@ AT_CHECK([cp pid newpid], [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` && + [parentpid=`cat parentpid` && + parent=`cat parent` && test $parentpid = $parent], [0], [], [], [kill `cat parent`]) # Kill the daemon process with SIGTERM, and wait for the daemon @@ -79,7 +79,7 @@ AT_CLEANUP AT_SETUP([daemon --detach --monitor - Python]) AT_SKIP_IF([test $HAVE_PYTHON = no]) -m4_define([CHECK], +m4_define([CHECK], [AT_CHECK([$1], [$2], [$3], [$4], [kill `cat daemon monitor`])]) AT_CAPTURE_FILE([daemon]) AT_CAPTURE_FILE([olddaemon]) diff --git a/tests/test-daemon.py b/tests/test-daemon.py index 3c757f308..98a516580 100644 --- a/tests/test-daemon.py +++ b/tests/test-daemon.py @@ -1,11 +1,11 @@ # Copyright (c) 2010 Nicira Networks. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.