summary refs log tree commit diff
path: root/tests/push/test_email.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-06-24 10:00:13 +0100
committerRichard van der Hoff <richard@matrix.org>2019-06-24 10:00:13 +0100
commit5097aee740b542407e5bb13d19a3e3e6c2227316 (patch)
tree09a03650256e09cd0b5df59dbf2d7bb2ba14df6c /tests/push/test_email.py
parentchangelog (diff)
parentImprove help and cmdline option names for --generate-config options (#5512) (diff)
downloadsynapse-5097aee740b542407e5bb13d19a3e3e6c2227316.tar.xz
Merge branch 'develop' into rav/cleanup_metrics
Diffstat (limited to 'tests/push/test_email.py')
-rw-r--r--tests/push/test_email.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/push/test_email.py b/tests/push/test_email.py
index 72760a0733..358b593cd4 100644
--- a/tests/push/test_email.py
+++ b/tests/push/test_email.py
@@ -57,7 +57,7 @@ class EmailPusherTests(HomeserverTestCase):
         config["email"] = {
             "enable_notifs": True,
             "template_dir": os.path.abspath(
-                pkg_resources.resource_filename('synapse', 'res/templates')
+                pkg_resources.resource_filename("synapse", "res/templates")
             ),
             "expiry_template_html": "notice_expiry.html",
             "expiry_template_text": "notice_expiry.txt",
@@ -120,7 +120,7 @@ class EmailPusherTests(HomeserverTestCase):
         # Create a simple room with two users
         room = self.helper.create_room_as(self.user_id, tok=self.access_token)
         self.helper.invite(
-            room=room, src=self.user_id, tok=self.access_token, targ=self.others[0].id,
+            room=room, src=self.user_id, tok=self.access_token, targ=self.others[0].id
         )
         self.helper.join(room=room, user=self.others[0].id, tok=self.others[0].token)
 
@@ -141,7 +141,7 @@ class EmailPusherTests(HomeserverTestCase):
 
         for other in self.others:
             self.helper.invite(
-                room=room, src=self.user_id, tok=self.access_token, targ=other.id,
+                room=room, src=self.user_id, tok=self.access_token, targ=other.id
             )
             self.helper.join(room=room, user=other.id, tok=other.token)