diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-11-06 11:59:22 -0500 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-11-06 11:59:22 -0500 |
commit | a5a59ab8ac6d6b244158261ee4d307d419b20180 (patch) | |
tree | d809f7205647c13b93a103727dab6f4a19c878e4 /tests/push | |
parent | fix merge conflict (diff) | |
parent | Merge branch 'master' into develop (diff) | |
download | synapse-a5a59ab8ac6d6b244158261ee4d307d419b20180.tar.xz |
Merge branch 'develop' into uhoreg/e2e_backup_hash
Diffstat (limited to 'tests/push')
-rw-r--r-- | tests/push/test_http.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/push/test_http.py b/tests/push/test_http.py index 8ce6bb62da..af2327fb66 100644 --- a/tests/push/test_http.py +++ b/tests/push/test_http.py @@ -50,7 +50,7 @@ class HTTPPusherTests(HomeserverTestCase): config = self.default_config() config["start_pushers"] = True - hs = self.setup_test_homeserver(config=config, simple_http_client=m) + hs = self.setup_test_homeserver(config=config, proxied_http_client=m) return hs |