summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-15 10:16:41 +0100
committerNeil Johnson <neil@matrix.org>2018-08-15 10:16:41 +0100
commitab035bdeaca5019289e6587a625e87c995d3deeb (patch)
treeda274353e069ea672bac06256aafff0259b6900c /tests
parentMerge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email (diff)
downloadsynapse-ab035bdeaca5019289e6587a625e87c995d3deeb.tar.xz
replace admin_email with admin_uri for greater flexibility
Diffstat (limited to 'tests')
-rw-r--r--tests/api/test_auth.py4
-rw-r--r--tests/utils.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/api/test_auth.py b/tests/api/test_auth.py
index e8a1894e65..8c1ee9cdcc 100644
--- a/tests/api/test_auth.py
+++ b/tests/api/test_auth.py
@@ -457,7 +457,7 @@ class AuthTestCase(unittest.TestCase):
 
         with self.assertRaises(AuthError) as e:
             yield self.auth.check_auth_blocking()
-        self.assertEquals(e.exception.admin_email, self.hs.config.admin_email)
+        self.assertEquals(e.exception.admin_uri, self.hs.config.admin_uri)
         self.assertEquals(e.exception.errcode, Codes.MAU_LIMIT_EXCEEDED)
         self.assertEquals(e.exception.code, 403)
 
@@ -473,6 +473,6 @@ class AuthTestCase(unittest.TestCase):
         self.hs.config.hs_disabled_message = "Reason for being disabled"
         with self.assertRaises(AuthError) as e:
             yield self.auth.check_auth_blocking()
-        self.assertEquals(e.exception.admin_email, self.hs.config.admin_email)
+        self.assertEquals(e.exception.admin_uri, self.hs.config.admin_uri)
         self.assertEquals(e.exception.errcode, Codes.HS_DISABLED)
         self.assertEquals(e.exception.code, 403)
diff --git a/tests/utils.py b/tests/utils.py
index 4af81624eb..52326d4f67 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -139,7 +139,7 @@ def setup_test_homeserver(
         config.hs_disabled_message = ""
         config.max_mau_value = 50
         config.mau_limits_reserved_threepids = []
-        config.admin_email = None
+        config.admin_uri = None
 
         # we need a sane default_room_version, otherwise attempts to create rooms will
         # fail.