diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/qpid/messaging/endpoints.py | 1 | ||||
| -rw-r--r-- | python/qpid/tests/messaging/__init__.py | 5 | ||||
| -rw-r--r-- | python/qpid/tests/messaging/endpoints.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/python/qpid/messaging/endpoints.py b/python/qpid/messaging/endpoints.py index 7d7d4249a3..886b7f1706 100644 --- a/python/qpid/messaging/endpoints.py +++ b/python/qpid/messaging/endpoints.py @@ -261,6 +261,7 @@ class Connection(Endpoint): def _unlinked(self): return [l for ssn in self.sessions.values() + if not (ssn.error or ssn.closed) for l in ssn.senders + ssn.receivers if not (l.linked or l.error or l.closed)] diff --git a/python/qpid/tests/messaging/__init__.py b/python/qpid/tests/messaging/__init__.py index ddacf77609..8f6680d5e3 100644 --- a/python/qpid/tests/messaging/__init__.py +++ b/python/qpid/tests/messaging/__init__.py @@ -56,7 +56,7 @@ class Base(Test): self.conn = None def teardown_connection(self, conn): - conn.close() + conn.close(timeout=self.timeout()) def content(self, base, count = None): if count is None: @@ -159,6 +159,9 @@ class Base(Test): def delay(self): return float(self.config.defines.get("delay", "2")) + def timeout(self): + return float(self.config.defines.get("timeout", "60")) + def get_bool(self, name): return self.config.defines.get(name, "false").lower() in ("true", "yes", "1") diff --git a/python/qpid/tests/messaging/endpoints.py b/python/qpid/tests/messaging/endpoints.py index 185a90b994..60723114fe 100644 --- a/python/qpid/tests/messaging/endpoints.py +++ b/python/qpid/tests/messaging/endpoints.py @@ -710,7 +710,7 @@ class ReceiverTests(Base): def fetchFromConcurrentCloseTest(self, entry): def closer(): - time.sleep(self.delay()) + self.sleep() entry.close() t = Thread(target=closer) t.start() |