svn commit: r984058 - /qpid/trunk/qpid/python/qpid/brokertest.py

[kp...@apache.org]

Author: kpvdr
Date: Tue Aug 10 14:45:58 2010
New Revision: 984058

URL: http://svn.apache.org/viewvc?rev=984058&view=rev
Log:
Added broker wait timeout to broker test framework

Modified:
    qpid/trunk/qpid/python/qpid/brokertest.py

Modified: qpid/trunk/qpid/python/qpid/brokertest.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/brokertest.py?rev=984058&r1=984057&r2=984058&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/brokertest.py (original)
+++ qpid/trunk/qpid/python/qpid/brokertest.py Tue Aug 10 14:45:58 2010
@@ -277,7 +277,7 @@ class Broker(Popen):
     def get_log(self):
         return os.path.abspath(self.log)
 
-    def __init__(self, test, args=[], name=None, expect=EXPECT_RUNNING, port=0, log_level=None):
+    def __init__(self, test, args=[], name=None, expect=EXPECT_RUNNING, port=0, log_level=None, wait=None):
         """Start a broker daemon. name determines the data-dir and log
         file names."""
 
@@ -285,6 +285,8 @@ class Broker(Popen):
         self._port=port
         cmd = [BrokerTest.qpidd_exec, "--port", port, "--no-module-dir"] + args
         if not "--auth" in args: cmd.append("--auth=no")
+        if wait != None:
+            cmd += ["--wait", str(wait)]
         if name: self.name = name
         else:
             self.name = "broker%d" % Broker._broker_count



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org