diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-10 16:21:34 -0400 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-10 16:21:34 -0400 |
| commit | d09a9aa8d1dbbabcb3f9b45649af0366f4a7d8d8 (patch) | |
| tree | fe69fcfef49cf8bb385b9e184f4643aa257bb245 /tests | |
| parent | 80ff4e19612d38b9c8105eb4d0bfa41eb9a4fbd9 (diff) | |
servicetest: improve timeout output
Copied from MC master.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/twisted/servicetest.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/twisted/servicetest.py b/tests/twisted/servicetest.py index e06d631b7..0beedb4d0 100644 --- a/tests/twisted/servicetest.py +++ b/tests/twisted/servicetest.py @@ -197,7 +197,14 @@ class BaseEventQueue: t = time.time() while True: - event = self.wait([pattern.subqueue]) + try: + event = self.wait([pattern.subqueue]) + except TimeoutError: + self.log('timeout') + self.log('still expecting:') + self.log(' - %r' % pattern) + raise + self._check_forbidden(event) if pattern.match(event): |