summary refs log tree commit diff
path: root/tests/rest/client/test_consent.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-11 13:29:42 +0100
committerGitHub <noreply@github.com>2019-06-11 13:29:42 +0100
commit9532eb55ecbd4e3a9b0e547257ab9456e7d59c96 (patch)
tree6bff38796aaad0920db0dcc38a0e8ab497665707 /tests/rest/client/test_consent.py
parentNeilj/improve federation docs (#5419) (diff)
parentBump bleach version so that tests can run on old deps. (diff)
downloadsynapse-9532eb55ecbd4e3a9b0e547257ab9456e7d59c96.tar.xz
Merge pull request #5424 from matrix-org/erikj/change_password_reset_links
Change password reset links to /_matrix.
Diffstat (limited to 'tests/rest/client/test_consent.py')
-rw-r--r--tests/rest/client/test_consent.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/rest/client/test_consent.py b/tests/rest/client/test_consent.py

index 88f8f1abdc..efc5a99db3 100644 --- a/tests/rest/client/test_consent.py +++ b/tests/rest/client/test_consent.py
@@ -23,14 +23,8 @@ from synapse.rest.consent import consent_resource from tests import unittest from tests.server import render -try: - from synapse.push.mailer import load_jinja2_templates -except Exception: - load_jinja2_templates = None - class ConsentResourceTestCase(unittest.HomeserverTestCase): - skip = "No Jinja installed" if not load_jinja2_templates else None servlets = [ synapse.rest.admin.register_servlets_for_client_rest_resource, room.register_servlets,