summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2010-03-22 20:07:17 +0000
committerAlan Conway <aconway@apache.org>2010-03-22 20:07:17 +0000
commitb9220bda78506a4f6494d87bd89e6f45919885c3 (patch)
treeec316629ae20b8ddd74eb56a511486209b33dc42
parentf7ec31f3914314d6d0d59c6617ef10a54c21654a (diff)
downloadqpid-python-b9220bda78506a4f6494d87bd89e6f45919885c3.tar.gz
Minor improvements to brokertest.py.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@926300 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--extras/qmf/.gitignore1
-rw-r--r--python/qpid/brokertest.py3
-rw-r--r--tools/.gitignore1
3 files changed, 4 insertions, 1 deletions
diff --git a/extras/qmf/.gitignore b/extras/qmf/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/extras/qmf/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/python/qpid/brokertest.py b/python/qpid/brokertest.py
index 26b46ad468..25642d0c88 100644
--- a/python/qpid/brokertest.py
+++ b/python/qpid/brokertest.py
@@ -178,6 +178,7 @@ class Popen(popen2.Popen3):
def stop(self): # Clean up at end of test.
self.drain()
+ self.stdin.close()
if self.expect == EXPECT_UNKNOWN:
try: self.kill() # Just make sure its dead
except: pass
@@ -266,7 +267,7 @@ class Broker(Popen):
cmd += ["--data-dir", self.datadir]
Popen.__init__(self, cmd, expect, drain=False)
test.cleanup_stop(self)
- self._host = "localhost"
+ self._host = "127.0.0.1"
log.debug("Started broker %s (%s, %s)" % (self.name, self.pname, self.log))
self._log_ready = False
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1 @@
+/build