summary refs log tree commit diff
path: root/tests/push
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-11 11:46:32 +0100
committerErik Johnston <erik@matrix.org>2019-06-11 12:34:18 +0100
commita766c41d258b48ca1690723c1aa51684baa05e6a (patch)
tree08657c512a257603be850e459d82f3e4a8e86e70 /tests/push
parentNewsfile (diff)
downloadsynapse-a766c41d258b48ca1690723c1aa51684baa05e6a.tar.xz
Bump bleach version so that tests can run on old deps.
Diffstat (limited to 'tests/push')
-rw-r--r--tests/push/test_email.py6
-rw-r--r--tests/push/test_http.py6
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,