summary refs log tree commit diff
path: root/tests/push/test_http.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/push/test_http.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/push/test_http.py')
-rw-r--r--tests/push/test_http.py6
1 files changed, 0 insertions, 6 deletions
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,