summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2010-07-12 18:06:19 +0000
committerAlan Conway <aconway@apache.org>2010-07-12 18:06:19 +0000
commitf9a21d0974911b4fdeb4a8ce6fc5780efc8df3ff (patch)
treec38dda3c93a2a58b2c560060a15d216ebc5545cf
parent4739ca25936b56e123a10aca584064478500dca4 (diff)
downloadqpid-python-f9a21d0974911b4fdeb4a8ce6fc5780efc8df3ff.tar.gz
Fix test framework error causing "AttributeError: Popen instance has no attribute '_clean'"
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@963409 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--python/qpid/brokertest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/qpid/brokertest.py b/python/qpid/brokertest.py
index 5473bd588e..f1a58aa8a9 100644
--- a/python/qpid/brokertest.py
+++ b/python/qpid/brokertest.py
@@ -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)