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/api | |
| 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/api')
| -rw-r--r-- | tests/api/test_auth.py | 2 | ||||
| -rw-r--r-- | tests/api/test_filtering.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/api/test_auth.py b/tests/api/test_auth.py index f8e28876bb..a65689ba89 100644 --- a/tests/api/test_auth.py +++ b/tests/api/test_auth.py @@ -39,7 +39,7 @@ class AuthTestCase(unittest.TestCase): self.state_handler = Mock() self.store = Mock() - self.hs = yield setup_test_homeserver(handlers=None) + self.hs = yield setup_test_homeserver(self.addCleanup, handlers=None) self.hs.get_datastore = Mock(return_value=self.store) self.hs.handlers = TestHandlers(self.hs) self.auth = Auth(self.hs) diff --git a/tests/api/test_filtering.py b/tests/api/test_filtering.py index 1c2d71052c..48b2d3d663 100644 --- a/tests/api/test_filtering.py +++ b/tests/api/test_filtering.py @@ -46,7 +46,10 @@ class FilteringTestCase(unittest.TestCase): self.mock_http_client.put_json = DeferredMockCallable() hs = yield setup_test_homeserver( - handlers=None, http_client=self.mock_http_client, keyring=Mock() + self.addCleanup, + handlers=None, + http_client=self.mock_http_client, + keyring=Mock(), ) self.filtering = hs.get_filtering() |