diff options
| author | Keith Wall <kwall@apache.org> | 2014-07-30 09:52:06 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-07-30 09:52:06 +0000 |
| commit | e14d5ac65ab85136991aedb1802e5b507617c2f1 (patch) | |
| tree | 90041a7b0d7fa0ae73cff8c7397dd1d424fc1a5b /qpid/python | |
| parent | eecaec47b677338306658cc473c5f9a58cc657ee (diff) | |
| download | qpid-python-e14d5ac65ab85136991aedb1802e5b507617c2f1.tar.gz | |
NO-JIRA: Strengthen ant python test wrapper to ensure that ant will fail if it fails to identify the pid of the broker\'s process
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1614598 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python')
| -rw-r--r-- | qpid/python/qpid-python-test-ant.xml | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/qpid/python/qpid-python-test-ant.xml b/qpid/python/qpid-python-test-ant.xml index 15271a477b..a6f6ab5b32 100644 --- a/qpid/python/qpid-python-test-ant.xml +++ b/qpid/python/qpid-python-test-ant.xml @@ -82,16 +82,16 @@ </target> <target name="stop-broker" depends="init"> - <get-pid port="${qpid.port}" targetProperty="pid"/> - <echo>Stopping Qpid ${pid}</echo> + <get-pid port="${qpid.port}" targetProperty="pid" resultproperty="stopresultproperty"/> + <echo>Stopping Qpid with pid '${pid}'</echo> <kill-pid pid="${pid}" signo="-15"/> <await-port-free port="${qpid.port}" maxwait="${stop.maxwait}" checkevery="${socket.checkevery}" timeoutproperty="stop.timeout"/> </target> <target name="kill-broker" depends="init" if="stop.timeout"> - <get-pid port="${qpid.port}" targetProperty="pid"/> - <echo>Killing Qpid ${pid}</echo> + <get-pid port="${qpid.port}" targetProperty="pid" resultproperty="killresultproperty"/> + <echo>Killing Qpid with pid '${pid}'</echo> <kill-pid pid="${pid}" signo="-9"/> </target> @@ -117,11 +117,19 @@ <macrodef name="get-pid"> <attribute name="targetProperty"/> <attribute name="port"/> + <attribute name="resultproperty"/> <sequential> - <exec executable="lsof" outputproperty="@{targetProperty}"> + <exec executable="lsof" outputproperty="@{targetProperty}" resultproperty="@{resultproperty}"> <arg value="-t"/> <!-- Terse output --> <arg value="-i"/> <arg value=":@{port}"/> </exec> + <fail message="lsof failed to determine the pid using port @{port}, exit status ${@{resultproperty}}"> + <condition> + <not> + <equals arg1="${@{resultproperty}}" arg2="0"/> + </not> + </condition> + </fail> </sequential> </macrodef> |