diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-11-03 00:19:23 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-03 00:19:23 +1100 |
| commit | cb7a6b2379e0e0a4ba8043da98e376b45d05b977 (patch) | |
| tree | a1eb48d453fc0b444216d2ebf0ea05af4f4244d4 /tests/server.py | |
| parent | Merge pull request #4132 from matrix-org/rav/fix_device_list_locking (diff) | |
| download | synapse-cb7a6b2379e0e0a4ba8043da98e376b45d05b977.tar.xz | |
Fix typing being reset causing infinite syncs (#4127)
Diffstat (limited to 'tests/server.py')
| -rw-r--r-- | tests/server.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/server.py b/tests/server.py index 819c854448..cc6dbe04ac 100644 --- a/tests/server.py +++ b/tests/server.py @@ -21,6 +21,12 @@ from synapse.util import Clock from tests.utils import setup_test_homeserver as _sth +class TimedOutException(Exception): + """ + A web query timed out. + """ + + @attr.s class FakeChannel(object): """ @@ -153,7 +159,7 @@ def wait_until_result(clock, request, timeout=100): x += 1 if x > timeout: - raise Exception("Timed out waiting for request to finish.") + raise TimedOutException("Timed out waiting for request to finish.") clock.advance(0.1) |