diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-08-14 20:56:23 +1000 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-08-14 20:56:23 +1000 |
| commit | 591bf87c6afcdb4e8978a275219dd10dba4efc25 (patch) | |
| tree | a2620b679bcaa6ecf75388be0ed5e17fa350d2cd /tests/server.py | |
| parent | Fixes test_reap_monthly_active_users so it passes under postgres (diff) | |
| parent | Implement a new test baseclass to cut down on boilerplate (#3684) (diff) | |
| download | synapse-591bf87c6afcdb4e8978a275219dd10dba4efc25.tar.xz | |
Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_postgres
Diffstat (limited to 'tests/server.py')
| -rw-r--r-- | tests/server.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/server.py b/tests/server.py index 05708be8b9..beb24cf032 100644 --- a/tests/server.py +++ b/tests/server.py @@ -147,12 +147,15 @@ class ThreadedMemoryReactorClock(MemoryReactorClock): return d -def setup_test_homeserver(*args, **kwargs): +def setup_test_homeserver(cleanup_func, *args, **kwargs): """ Set up a synchronous test server, driven by the reactor used by the homeserver. """ - d = _sth(*args, **kwargs).result + d = _sth(cleanup_func, *args, **kwargs).result + + if isinstance(d, Failure): + d.raiseException() # Make the thread pool synchronous. clock = d.get_clock() @@ -189,6 +192,9 @@ def setup_test_homeserver(*args, **kwargs): def start(self): pass + def stop(self): + pass + def callInThreadWithCallback(self, onResult, function, *args, **kwargs): def _(res): if isinstance(res, Failure): |