diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-06-04 01:16:01 +1000 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2019-06-04 01:16:01 +1000 |
| commit | 6f9f08005cd8973418662c716fec7c808e2cd0b2 (patch) | |
| tree | 83af2f021f64c90003b94fce60f839a2bc6192aa /tests | |
| parent | add stuff in bg updates (diff) | |
| parent | Merge pull request #5307 from matrix-org/rav/server_keys/07-fix-notary-cache-... (diff) | |
| download | synapse-6f9f08005cd8973418662c716fec7c808e2cd0b2.tar.xz | |
Merge remote-tracking branch 'origin/develop' into hawkowl/full-schema-v1
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/__init__.py | 2 | ||||
| -rw-r--r-- | tests/rest/admin/test_admin.py | 1 | ||||
| -rw-r--r-- | tests/rest/client/v1/test_profile.py | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/tests/__init__.py b/tests/__init__.py index d3181f9403..f7fc502f01 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -21,4 +21,4 @@ import tests.patch_inline_callbacks # attempt to do the patch before we load any synapse code tests.patch_inline_callbacks.do_patch() -util.DEFAULT_TIMEOUT_DURATION = 10 +util.DEFAULT_TIMEOUT_DURATION = 20 diff --git a/tests/rest/admin/test_admin.py b/tests/rest/admin/test_admin.py index ee5f09041f..e5fc2fcd15 100644 --- a/tests/rest/admin/test_admin.py +++ b/tests/rest/admin/test_admin.py @@ -408,7 +408,6 @@ class ShutdownRoomTestCase(unittest.HomeserverTestCase): users_in_room = self.get_success(self.store.get_users_in_room(room_id)) self.assertEqual([], users_in_room) - @unittest.DEBUG def test_shutdown_room_block_peek(self): """Test that a world_readable room can no longer be peeked into after it has been shut down. diff --git a/tests/rest/client/v1/test_profile.py b/tests/rest/client/v1/test_profile.py index f4d0d48dad..72c7ed93cb 100644 --- a/tests/rest/client/v1/test_profile.py +++ b/tests/rest/client/v1/test_profile.py @@ -30,7 +30,7 @@ from tests import unittest from ....utils import MockHttpResource, setup_test_homeserver myid = "@1234ABCD:test" -PATH_PREFIX = "/_matrix/client/api/v1" +PATH_PREFIX = "/_matrix/client/r0" class MockHandlerProfileTestCase(unittest.TestCase): |