diff --git a/tests/server_notices/test_resource_limits_server_notices.py b/tests/server_notices/test_resource_limits_server_notices.py
index a69253f1b6..fb8c593a75 100644
--- a/tests/server_notices/test_resource_limits_server_notices.py
+++ b/tests/server_notices/test_resource_limits_server_notices.py
@@ -2,6 +2,7 @@ from mock import Mock
from twisted.internet import defer
+from synapse.api.constants import EventTypes
from synapse.api.errors import AuthError
from synapse.handlers.auth import AuthHandler
from synapse.server_notices.resource_limits_server_notices import (
@@ -20,7 +21,7 @@ class AuthHandlers(object):
class TestResourceLimitsServerNotices(unittest.TestCase):
@defer.inlineCallbacks
def setUp(self):
- self.hs = yield setup_test_homeserver(handlers=None)
+ self.hs = yield setup_test_homeserver(self.addCleanup, handlers=None)
self.hs.handlers = AuthHandlers(self.hs)
self.auth_handler = self.hs.handlers.auth_handler
self.server_notices_sender = self.hs.get_server_notices_sender()
@@ -37,10 +38,23 @@ class TestResourceLimitsServerNotices(unittest.TestCase):
)
self._send_notice = self._rlsn._server_notices_manager.send_notice
self._rlsn._server_notices_manager.send_notice = Mock()
+ self._rlsn._state.get_current_state = Mock(return_value=defer.succeed(None))
+ self._rlsn._store.get_events = Mock(return_value=defer.succeed({}))
+
self._send_notice = self._rlsn._server_notices_manager.send_notice
self._rlsn._limit_usage_by_mau = True
- self.user_id = "user_id"
+ 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._rlsn._server_notices_manager.get_notice_room_for_user = Mock(
+ returnValue=""
+ )
+ self.hs.config.admin_uri = "mailto:user@test.com"
@defer.inlineCallbacks
def test_maybe_send_server_notice_to_user_flag_off(self):
@@ -48,13 +62,13 @@ class TestResourceLimitsServerNotices(unittest.TestCase):
# test hs disabled case
self._hs_disabled = True
- yield self._rlsn.maybe_send_server_notice_to_user("user_id")
+ 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
- yield self._rlsn.maybe_send_server_notice_to_user("user_id")
+ yield self._rlsn.maybe_send_server_notice_to_user(self.user_id)
self._send_notice.assert_not_called()
@@ -62,40 +76,40 @@ 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._notified_of_blocking.add(self.user_id)
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}
+ ))
yield self._rlsn.maybe_send_server_notice_to_user(self.user_id)
- # "remove warning" obviously aweful, but test will start failing when code
- # actually sends a real event, and then it can be updated
-
- self._send_notice.assert_called_once_with(self.user_id, "remove warning")
- self.assertFalse(self.user_id in self._rlsn._notified_of_blocking)
+ # Would be better to check the content, but once == remove blocking event
+ self._send_notice.assert_called_once()
@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._notified_of_blocking.add(self.user_id)
self._rlsn.auth.check_auth_blocking = Mock(
side_effect=AuthError(403, 'foo')
)
- yield self._rlsn.maybe_send_server_notice_to_user("user_id")
+ mock_event = Mock(type=EventTypes.ServerNoticeLimitReached)
+ self._rlsn._store.get_events = Mock(return_value=defer.succeed(
+ {"123": mock_event}
+ ))
+ yield self._rlsn.maybe_send_server_notice_to_user(self.user_id)
self._send_notice.assert_not_called()
- self.assertTrue(self.user_id in self._rlsn._notified_of_blocking)
@defer.inlineCallbacks
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'))
- yield self._rlsn.maybe_send_server_notice_to_user("user_id")
+ yield self._rlsn.maybe_send_server_notice_to_user(self.user_id)
- # "add warning" obviously awful, but test will start failing when code
- # actually sends a real event, and then it can be updated
- self._send_notice.assert_called_once_with(self.user_id, "add warning")
- self.assertTrue(self.user_id in self._rlsn._notified_of_blocking)
+ # Would be better to check contents, but 2 calls == set blocking event
+ self.assertTrue(self._send_notice.call_count == 2)
@defer.inlineCallbacks
def test_maybe_send_server_notice_to_user_add_blocked_notice_noop(self):
@@ -106,7 +120,6 @@ class TestResourceLimitsServerNotices(unittest.TestCase):
yield self._rlsn.maybe_send_server_notice_to_user(self.user_id)
self._send_notice.assert_not_called()
- self.assertFalse(self.user_id in self._rlsn._notified_of_blocking)
@defer.inlineCallbacks
def test_maybe_send_server_notice_to_user_not_in_mau_cohort(self):
@@ -122,4 +135,3 @@ class TestResourceLimitsServerNotices(unittest.TestCase):
yield self._rlsn.maybe_send_server_notice_to_user(self.user_id)
self._send_notice.assert_not_called()
- self.assertFalse(self.user_id in self._rlsn._notified_of_blocking)
|
