diff options
| author | Eric Eastwood <erice@element.io> | 2023-07-10 11:10:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-10 11:10:20 -0500 |
| commit | c9bf644fa0c2c06f8143b14ccdb655feebed97df (patch) | |
| tree | 97589dc35b97f87f23f3fd579b5015bec17a40c5 /tests/storage | |
| parent | Revert "Placeholder changelog" (diff) | |
| download | synapse-c9bf644fa0c2c06f8143b14ccdb655feebed97df.tar.xz | |
Revert "Federation outbound proxy" (#15910)
Revert "Federation outbound proxy (#15773)" This reverts commit b07b14b494ae1dd564b4c44f844c9a9545b3d08a.
Diffstat (limited to 'tests/storage')
| -rw-r--r-- | tests/storage/test_e2e_room_keys.py | 2 | ||||
| -rw-r--r-- | tests/storage/test_purge.py | 2 | ||||
| -rw-r--r-- | tests/storage/test_rollback_worker.py | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tests/storage/test_e2e_room_keys.py b/tests/storage/test_e2e_room_keys.py index f6df31aba4..9cb326d90a 100644 --- a/tests/storage/test_e2e_room_keys.py +++ b/tests/storage/test_e2e_room_keys.py @@ -31,7 +31,7 @@ room_key: RoomKey = { class E2eRoomKeysHandlerTestCase(unittest.HomeserverTestCase): def make_homeserver(self, reactor: MemoryReactor, clock: Clock) -> HomeServer: - hs = self.setup_test_homeserver("server") + hs = self.setup_test_homeserver("server", federation_http_client=None) self.store = hs.get_datastores().main return hs diff --git a/tests/storage/test_purge.py b/tests/storage/test_purge.py index 0282673167..857e2caf2e 100644 --- a/tests/storage/test_purge.py +++ b/tests/storage/test_purge.py @@ -27,7 +27,7 @@ class PurgeTests(HomeserverTestCase): servlets = [room.register_servlets] def make_homeserver(self, reactor: MemoryReactor, clock: Clock) -> HomeServer: - hs = self.setup_test_homeserver("server") + hs = self.setup_test_homeserver("server", federation_http_client=None) return hs def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None: diff --git a/tests/storage/test_rollback_worker.py b/tests/storage/test_rollback_worker.py index 809c9f175d..6861d3a6c9 100644 --- a/tests/storage/test_rollback_worker.py +++ b/tests/storage/test_rollback_worker.py @@ -45,7 +45,9 @@ def fake_listdir(filepath: str) -> List[str]: class WorkerSchemaTests(HomeserverTestCase): def make_homeserver(self, reactor: MemoryReactor, clock: Clock) -> HomeServer: - hs = self.setup_test_homeserver(homeserver_to_use=GenericWorkerServer) + hs = self.setup_test_homeserver( + federation_http_client=None, homeserver_to_use=GenericWorkerServer + ) return hs def default_config(self) -> JsonDict: |