summary refs log tree commit diff
path: root/tests/replication/test_pusher_shard.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-02-26 14:05:40 +0000
committerRichard van der Hoff <richard@matrix.org>2021-02-26 14:05:40 +0000
commitfdbccc1e74c56da19bffc33bfe4f9f8d2b2d26f8 (patch)
tree4e2e1bdc58f6f77d7856e56261ace9b0218bb9f6 /tests/replication/test_pusher_shard.py
parentRevert "Redirect redirect requests if they arrive on the wrong URI" (diff)
parentSSO: redirect to public URL before setting cookies (#9436) (diff)
downloadsynapse-fdbccc1e74c56da19bffc33bfe4f9f8d2b2d26f8.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'tests/replication/test_pusher_shard.py')
-rw-r--r--tests/replication/test_pusher_shard.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/replication/test_pusher_shard.py b/tests/replication/test_pusher_shard.py

index f118fe32af..ab2988a6ba 100644 --- a/tests/replication/test_pusher_shard.py +++ b/tests/replication/test_pusher_shard.py
@@ -95,7 +95,7 @@ class PusherShardTestCase(BaseMultiWorkerStreamTestCase): self.make_worker_hs( "synapse.app.pusher", - {"start_pushers": True}, + {"start_pushers": False}, proxied_blacklisted_http_client=http_client_mock, )