diff options
| author | Erik Johnston <erikj@jki.re> | 2016-12-09 17:27:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-09 17:27:45 +0000 |
| commit | b541fac7c391aebd02e45f2b221619191941de34 (patch) | |
| tree | 59e8f19b6c4e94a01bfb02b7fe9a4c5503949bd8 /tests/utils.py | |
| parent | Fix broken README merge (diff) | |
| parent | Fix unit tests (diff) | |
| download | synapse-b541fac7c391aebd02e45f2b221619191941de34.tar.xz | |
Merge pull request #1683 from matrix-org/erikj/notifier_sadness
Fix rare notifier bug where listeners dont timeout
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py index 2d0bd205fd..d3d6c8021d 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -294,6 +294,10 @@ class MockClock(object): def advance_time_msec(self, ms): self.advance_time(ms / 1000.) + def time_bound_deferred(self, d, *args, **kwargs): + # We don't bother timing things out for now. + return d + class SQLiteMemoryDbPool(ConnectionPool, object): def __init__(self): |