diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-11 11:46:32 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-06-11 12:34:18 +0100 |
| commit | a766c41d258b48ca1690723c1aa51684baa05e6a (patch) | |
| tree | 08657c512a257603be850e459d82f3e4a8e86e70 /tests/rest/client | |
| parent | Newsfile (diff) | |
| download | synapse-a766c41d258b48ca1690723c1aa51684baa05e6a.tar.xz | |
Bump bleach version so that tests can run on old deps.
Diffstat (limited to 'tests/rest/client')
| -rw-r--r-- | tests/rest/client/test_consent.py | 6 | ||||
| -rw-r--r-- | tests/rest/client/v2_alpha/test_register.py | 6 |
2 files changed, 0 insertions, 12 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, diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py index 0cb6a363d6..e9d8f3c734 100644 --- a/tests/rest/client/v2_alpha/test_register.py +++ b/tests/rest/client/v2_alpha/test_register.py @@ -30,11 +30,6 @@ from synapse.rest.client.v2_alpha import account_validity, register, sync from tests import unittest -try: - from synapse.push.mailer import load_jinja2_templates -except ImportError: - load_jinja2_templates = None - class RegisterRestServletTestCase(unittest.HomeserverTestCase): @@ -307,7 +302,6 @@ class AccountValidityTestCase(unittest.HomeserverTestCase): class AccountValidityRenewalByEmailTestCase(unittest.HomeserverTestCase): - skip = "No Jinja installed" if not load_jinja2_templates else None servlets = [ register.register_servlets, synapse.rest.admin.register_servlets_for_client_rest_resource, |