qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r963409 - /qpid/trunk/qpid/python/qpid/brokertest.py
Date Mon, 12 Jul 2010 18:06:20 GMT
Author: aconway
Date: Mon Jul 12 18:06:19 2010
New Revision: 963409

URL: http://svn.apache.org/viewvc?rev=963409&view=rev
Log:
Fix test framework error causing "AttributeError: Popen instance has no attribute '_clean'"

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=963409&r1=963408&r2=963409&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/brokertest.py (original)
+++ qpid/trunk/qpid/python/qpid/brokertest.py Mon Jul 12 18:06:19 2010
@@ -147,14 +147,15 @@ class Popen(popen2.Popen3):
         expect - if set verify expectation at end of test.
         drain  - if true (default) drain stdout/stderr to files.
         """
+        self._clean = False
         assert find_exe(cmd[0]), "executable not found: "+cmd[0]
         if type(cmd) is type(""): cmd = [cmd] # Make it a list.
         self.cmd  = [ str(x) for x in cmd ]
         self.returncode = None
-        popen2.Popen3.__init__(self, self.cmd, True)
         self.expect = expect
         self.pname = "%s-%d" % (os.path.split(self.cmd[0])[1], self.pid)
         msg = "Process %s" % self.pname
+        popen2.Popen3.__init__(self, self.cmd, True)
         self.stdin = ExceptionWrapper(self.tochild, msg)
         self.stdout = Popen.OutStream(self.fromchild, self.outfile("out"), msg)
         self.stderr = Popen.OutStream(self.childerr, self.outfile("err"), msg)
@@ -163,7 +164,6 @@ class Popen(popen2.Popen3):
         finally: f.close()
         log.debug("Started process %s: %s" % (self.pname, " ".join(self.cmd)))
         if drain: self.drain()
-        self._clean = False
 
         def __str__(self): return "Popen<%s>"%(self.pname)
 



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


Mime
View raw message