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/push | |
| 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/push')
| -rw-r--r-- | tests/push/test_email.py | 6 | ||||
| -rw-r--r-- | tests/push/test_http.py | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/tests/push/test_email.py b/tests/push/test_email.py index 9cdde1a9bd..9bc5f07de1 100644 --- a/tests/push/test_email.py +++ b/tests/push/test_email.py @@ -24,15 +24,9 @@ from synapse.rest.client.v1 import login, room from tests.unittest import HomeserverTestCase -try: - from synapse.push.mailer import load_jinja2_templates -except Exception: - load_jinja2_templates = None - class EmailPusherTests(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/push/test_http.py b/tests/push/test_http.py index aba618b2be..22c3f73ef3 100644 --- a/tests/push/test_http.py +++ b/tests/push/test_http.py @@ -23,15 +23,9 @@ from synapse.util.logcontext import make_deferred_yieldable from tests.unittest import HomeserverTestCase -try: - from synapse.push.mailer import load_jinja2_templates -except Exception: - load_jinja2_templates = None - class HTTPPusherTests(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, |