summary refs log tree commit diff
path: root/tests/push/test_email.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-21 14:10:31 +0000
committerErik Johnston <erik@matrix.org>2019-03-21 14:10:31 +0000
commitb0bf1ea7bda4894bae92a895c957a1a2ce431f4e (patch)
treec1ab07c55925e9c50aa0b7b55b4984bb9fc464e0 /tests/push/test_email.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentMerge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms (diff)
downloadsynapse-b0bf1ea7bda4894bae92a895c957a1a2ce431f4e.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/push/test_email.py')
-rw-r--r--tests/push/test_email.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/push/test_email.py b/tests/push/test_email.py

index 50ee6910d1..be3fed8de3 100644 --- a/tests/push/test_email.py +++ b/tests/push/test_email.py
@@ -63,8 +63,10 @@ class EmailPusherTests(HomeserverTestCase): config.email_smtp_port = 20 config.require_transport_security = False config.email_smtp_user = None + config.email_smtp_pass = None config.email_app_name = "Matrix" config.email_notif_from = "test@example.com" + config.email_riot_base_url = None hs = self.setup_test_homeserver(config=config, sendmail=sendmail)