From e14d5ac65ab85136991aedb1802e5b507617c2f1 Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Wed, 30 Jul 2014 09:52:06 +0000
Subject: 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
---
 qpid/python/qpid-python-test-ant.xml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'qpid/python')

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>
 
-- 
cgit v1.2.1