diff options
author | Erik Johnston <erik@matrix.org> | 2019-06-11 17:25:16 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-06-11 17:25:16 +0100 |
commit | 7e68691ce947cac0a470d8b8df3332958686ccc1 (patch) | |
tree | 75987c8c6556edf9d14dd5878c1c63a5fae2e5fb /tests/rest/client/test_consent.py | |
parent | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop (diff) | |
parent | 1.0.0 (diff) | |
download | synapse-7e68691ce947cac0a470d8b8df3332958686ccc1.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'tests/rest/client/test_consent.py')
-rw-r--r-- | tests/rest/client/test_consent.py | 6 |
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, |