summary refs log tree commit diff
path: root/tests/replication/_base.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-12-02 20:06:53 +0000
committerGitHub <noreply@github.com>2020-12-02 20:06:53 +0000
commited5172852ae79dec341a81feeb1b8b99bb1875d6 (patch)
treedffeceef18b5dbfd0ed07755200ae06c297512a5 /tests/replication/_base.py
parentremove unused FakeResponse (#8864) (diff)
parentnewsfile (diff)
downloadsynapse-ed5172852ae79dec341a81feeb1b8b99bb1875d6.tar.xz
Merge pull request #8858 from matrix-org/rav/sso_uia
UIA: offer only available auth flows
Diffstat (limited to 'tests/replication/_base.py')
-rw-r--r--tests/replication/_base.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/replication/_base.py b/tests/replication/_base.py

index 728de28277..3379189785 100644 --- a/tests/replication/_base.py +++ b/tests/replication/_base.py
@@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import logging -from typing import Any, Callable, List, Optional, Tuple +from typing import Any, Callable, Dict, List, Optional, Tuple import attr @@ -21,6 +21,7 @@ from twisted.internet.interfaces import IConsumer, IPullProducer, IReactorTime from twisted.internet.protocol import Protocol from twisted.internet.task import LoopingCall from twisted.web.http import HTTPChannel +from twisted.web.resource import Resource from synapse.app.generic_worker import ( GenericWorkerReplicationHandler, @@ -28,7 +29,7 @@ from synapse.app.generic_worker import ( ) from synapse.http.server import JsonResource from synapse.http.site import SynapseRequest, SynapseSite -from synapse.replication.http import ReplicationRestResource, streams +from synapse.replication.http import ReplicationRestResource from synapse.replication.tcp.handler import ReplicationCommandHandler from synapse.replication.tcp.protocol import ClientReplicationStreamProtocol from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory @@ -54,10 +55,6 @@ class BaseStreamTestCase(unittest.HomeserverTestCase): if not hiredis: skip = "Requires hiredis" - servlets = [ - streams.register_servlets, - ] - def prepare(self, reactor, clock, hs): # build a replication server server_factory = ReplicationStreamProtocolFactory(hs) @@ -88,6 +85,11 @@ class BaseStreamTestCase(unittest.HomeserverTestCase): self._client_transport = None self._server_transport = None + def create_resource_dict(self) -> Dict[str, Resource]: + d = super().create_resource_dict() + d["/_synapse/replication"] = ReplicationRestResource(self.hs) + return d + def _get_worker_hs_config(self) -> dict: config = self.default_config() config["worker_app"] = "synapse.app.generic_worker"