clean up, no functional changes

1 files changed, 17 insertions, 15 deletions

diff --git a/tests/server_notices/test_resource_limits_server_notices.py b/tests/server_notices/test_resource_limits_server_notices.py
index ccb69097b1..cc8d2f539c 100644
--- a/tests/server_notices/test_resource_limits_server_notices.py
+++ b/tests/server_notices/test_resource_limits_server_notices.py
@@ -3,7 +3,7 @@ from mock import Mock
 from twisted.internet import defer
 
 from synapse.api.constants import EventTypes
-from synapse.api.errors import AuthError
+from synapse.api.errors import ResourceLimitError
 from synapse.handlers.auth import AuthHandler
 from synapse.server_notices.resource_limits_server_notices import (
     ResourceLimitsServerNotices,
@@ -43,13 +43,13 @@ class TestResourceLimitsServerNotices(unittest.TestCase):
 
         self._send_notice = self._rlsn._server_notices_manager.send_notice
 
-        self._rlsn._limit_usage_by_mau = True
+        self.hs.config.limit_usage_by_mau = True
         self.user_id = "@user_id:test"
 
-        self.server_notices_mxid = "@server:test"
-        self.server_notices_mxid_display_name = None
-        self.server_notices_mxid_avatar_url = None
-        self.server_notices_room_name = "Server Notices"
+        # self.server_notices_mxid = "@server:test"
+        # self.server_notices_mxid_display_name = None
+        # self.server_notices_mxid_avatar_url = None
+        # self.server_notices_room_name = "Server Notices"
 
         self._rlsn._server_notices_manager.get_notice_room_for_user = Mock(
             returnValue=""
@@ -61,14 +61,14 @@ class TestResourceLimitsServerNotices(unittest.TestCase):
     def test_maybe_send_server_notice_to_user_flag_off(self):
         """Tests cases where the flags indicate nothing to do"""
         # test hs disabled case
-        self._hs_disabled = True
+        self.hs.config.hs_disabled = True
 
         yield self._rlsn.maybe_send_server_notice_to_user(self.user_id)
 
         self._send_notice.assert_not_called()
         # Test when mau limiting disabled
-        self._hs_disabled = False
-        self._rlsn._limit_usage_by_mau = False
+        self.hs.config.hs_disabled = False
+        self.hs.limit_usage_by_mau = False
         yield self._rlsn.maybe_send_server_notice_to_user(self.user_id)
 
         self._send_notice.assert_not_called()
@@ -77,7 +77,7 @@ class TestResourceLimitsServerNotices(unittest.TestCase):
     def test_maybe_send_server_notice_to_user_remove_blocked_notice(self):
         """Test when user has blocked notice, but should have it removed"""
 
-        self._rlsn.auth.check_auth_blocking = Mock()
+        self._rlsn._auth.check_auth_blocking = Mock()
         mock_event = Mock(type=EventTypes.ServerNoticeLimitReached)
         self._rlsn._store.get_events = Mock(return_value=defer.succeed(
             {"123": mock_event}
@@ -90,8 +90,8 @@ class TestResourceLimitsServerNotices(unittest.TestCase):
     @defer.inlineCallbacks
     def test_maybe_send_server_notice_to_user_remove_blocked_notice_noop(self):
         """Test when user has blocked notice, but notice ought to be there (NOOP)"""
-        self._rlsn.auth.check_auth_blocking = Mock(
-            side_effect=AuthError(403, 'foo')
+        self._rlsn._auth.check_auth_blocking = Mock(
+            side_effect=ResourceLimitError(403, 'foo')
         )
 
         mock_event = Mock(type=EventTypes.ServerNoticeLimitReached)
@@ -106,7 +106,9 @@ class TestResourceLimitsServerNotices(unittest.TestCase):
     def test_maybe_send_server_notice_to_user_add_blocked_notice(self):
         """Test when user does not have blocked notice, but should have one"""
 
-        self._rlsn.auth.check_auth_blocking = Mock(side_effect=AuthError(403, 'foo'))
+        self._rlsn._auth.check_auth_blocking = Mock(
+            side_effect=ResourceLimitError(403, 'foo')
+        )
         yield self._rlsn.maybe_send_server_notice_to_user(self.user_id)
 
         # Would be better to check contents, but 2 calls == set blocking event
@@ -116,7 +118,7 @@ class TestResourceLimitsServerNotices(unittest.TestCase):
     def test_maybe_send_server_notice_to_user_add_blocked_notice_noop(self):
         """Test when user does not have blocked notice, nor should they (NOOP)"""
 
-        self._rlsn.auth.check_auth_blocking = Mock()
+        self._rlsn._auth.check_auth_blocking = Mock()
 
         yield self._rlsn.maybe_send_server_notice_to_user(self.user_id)
 
@@ -129,7 +131,7 @@ class TestResourceLimitsServerNotices(unittest.TestCase):
         happen - but ...
         """
 
-        self._rlsn.auth.check_auth_blocking = Mock()
+        self._rlsn._auth.check_auth_blocking = Mock()
         self._rlsn._store.user_last_seen_monthly_active = Mock(
             return_value=defer.succeed(None)
         )