diff options
Diffstat (limited to 'qpid/cpp/src/tests/brokertest.py')
| -rw-r--r-- | qpid/cpp/src/tests/brokertest.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py index f7f446b893..5b18e58dee 100644 --- a/qpid/cpp/src/tests/brokertest.py +++ b/qpid/cpp/src/tests/brokertest.py @@ -76,7 +76,7 @@ def error_line(filename, n=1): except: return "" return ":\n" + "".join(result) -def retry(function, timeout=10, delay=.01): +def retry(function, timeout=1, delay=.01): """Call function until it returns True or timeout expires. Double the delay for each retry. Return True if function returns true, False if timeout expires.""" @@ -277,8 +277,8 @@ class Broker(Popen): self.find_log() cmd += ["--log-to-file", self.log] cmd += ["--log-to-stderr=no"] - if log_level != None: - cmd += ["--log-enable=%s" % log_level] + cmd += ["--log-enable=%s"%(log_level or "info+") ] + self.datadir = self.name cmd += ["--data-dir", self.datadir] if show_cmd: print cmd @@ -526,7 +526,7 @@ class BrokerTest(TestCase): retry(test, timeout, delay) self.assertEqual(expect_contents, self.browse(session, queue, 0, transform=transform)) -def join(thread, timeout=10): +def join(thread, timeout=1): thread.join(timeout) if thread.isAlive(): raise Exception("Timed out joining thread %s"%thread) |