diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index f422cf3c5a..ad58073a14 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -38,23 +38,19 @@ def _expect_edu(destination, edu_type, content, origin="test"):
"origin": origin,
"origin_server_ts": 1000000,
"pdus": [],
- "edus": [
- {
- "edu_type": edu_type,
- "content": content,
- }
- ],
+ "edus": [{"edu_type": edu_type, "content": content}],
}
def _make_edu_json(origin, edu_type, content):
- return json.dumps(
- _expect_edu("test", edu_type, content, origin=origin)
- ).encode('utf8')
+ return json.dumps(_expect_edu("test", edu_type, content, origin=origin)).encode(
+ 'utf8'
+ )
class TypingNotificationsTestCase(unittest.TestCase):
"""Tests typing notifications to rooms."""
+
@defer.inlineCallbacks
def setUp(self):
self.clock = MockClock()
@@ -71,21 +67,24 @@ class TypingNotificationsTestCase(unittest.TestCase):
self.state_handler = Mock()
hs = yield setup_test_homeserver(
+ self.addCleanup,
"test",
auth=self.auth,
clock=self.clock,
- datastore=Mock(spec=[
- # Bits that Federation needs
- "prep_send_transaction",
- "delivered_txn",
- "get_received_txn_response",
- "set_received_txn_response",
- "get_destination_retry_timings",
- "get_devices_by_remote",
- # Bits that user_directory needs
- "get_user_directory_stream_pos",
- "get_current_state_deltas",
- ]),
+ datastore=Mock(
+ spec=[
+ # Bits that Federation needs
+ "prep_send_transaction",
+ "delivered_txn",
+ "get_received_txn_response",
+ "set_received_txn_response",
+ "get_destination_retry_timings",
+ "get_devices_by_remote",
+ # Bits that user_directory needs
+ "get_user_directory_stream_pos",
+ "get_current_state_deltas",
+ ]
+ ),
state_handler=self.state_handler,
handlers=Mock(),
notifier=mock_notifier,
@@ -100,19 +99,16 @@ class TypingNotificationsTestCase(unittest.TestCase):
self.event_source = hs.get_event_sources().sources["typing"]
self.datastore = hs.get_datastore()
- retry_timings_res = {
- "destination": "",
- "retry_last_ts": 0,
- "retry_interval": 0,
- }
- self.datastore.get_destination_retry_timings.return_value = (
- defer.succeed(retry_timings_res)
+ retry_timings_res = {"destination": "", "retry_last_ts": 0, "retry_interval": 0}
+ self.datastore.get_destination_retry_timings.return_value = defer.succeed(
+ retry_timings_res
)
self.datastore.get_devices_by_remote.return_value = (0, [])
def get_received_txn_response(*args):
return defer.succeed(None)
+
self.datastore.get_received_txn_response = get_received_txn_response
self.room_id = "a-room"
@@ -125,10 +121,12 @@ class TypingNotificationsTestCase(unittest.TestCase):
def get_joined_hosts_for_room(room_id):
return set(member.domain for member in self.room_members)
+
self.datastore.get_joined_hosts_for_room = get_joined_hosts_for_room
def get_current_user_in_room(room_id):
return set(str(u) for u in self.room_members)
+
self.state_handler.get_current_user_in_room = get_current_user_in_room
self.datastore.get_user_directory_stream_pos.return_value = (
@@ -136,19 +134,13 @@ class TypingNotificationsTestCase(unittest.TestCase):
defer.succeed(1)
)
- self.datastore.get_current_state_deltas.return_value = (
- None
- )
+ self.datastore.get_current_state_deltas.return_value = None
self.auth.check_joined_room = check_joined_room
self.datastore.get_to_device_stream_token = lambda: 0
- self.datastore.get_new_device_msgs_for_remote = (
- lambda *args, **kargs: ([], 0)
- )
- self.datastore.delete_device_msgs_for_remote = (
- lambda *args, **kargs: None
- )
+ self.datastore.get_new_device_msgs_for_remote = lambda *args, **kargs: ([], 0)
+ self.datastore.delete_device_msgs_for_remote = lambda *args, **kargs: None
# Some local users to test with
self.u_apple = UserID.from_string("@apple:test")
@@ -170,24 +162,23 @@ class TypingNotificationsTestCase(unittest.TestCase):
timeout=20000,
)
- self.on_new_event.assert_has_calls([
- call('typing_key', 1, rooms=[self.room_id]),
- ])
+ self.on_new_event.assert_has_calls(
+ [call('typing_key', 1, rooms=[self.room_id])]
+ )
self.assertEquals(self.event_source.get_current_key(), 1)
events = yield self.event_source.get_new_events(
- room_ids=[self.room_id],
- from_key=0,
+ room_ids=[self.room_id], from_key=0
)
self.assertEquals(
events[0],
[
- {"type": "m.typing",
- "room_id": self.room_id,
- "content": {
- "user_ids": [self.u_apple.to_string()],
- }},
- ]
+ {
+ "type": "m.typing",
+ "room_id": self.room_id,
+ "content": {"user_ids": [self.u_apple.to_string()]},
+ }
+ ],
)
@defer.inlineCallbacks
@@ -206,13 +197,13 @@ class TypingNotificationsTestCase(unittest.TestCase):
"room_id": self.room_id,
"user_id": self.u_apple.to_string(),
"typing": True,
- }
+ },
),
json_data_callback=ANY,
long_retries=True,
backoff_on_404=True,
),
- defer.succeed((200, "OK"))
+ defer.succeed((200, "OK")),
)
yield self.handler.started_typing(
@@ -240,27 +231,29 @@ class TypingNotificationsTestCase(unittest.TestCase):
"room_id": self.room_id,
"user_id": self.u_onion.to_string(),
"typing": True,
- }
+ },
),
federation_auth=True,
)
- self.on_new_event.assert_has_calls([
- call('typing_key', 1, rooms=[self.room_id]),
- ])
+ self.on_new_event.assert_has_calls(
+ [call('typing_key', 1, rooms=[self.room_id])]
+ )
self.assertEquals(self.event_source.get_current_key(), 1)
events = yield self.event_source.get_new_events(
- room_ids=[self.room_id],
- from_key=0
+ room_ids=[self.room_id], from_key=0
+ )
+ self.assertEquals(
+ events[0],
+ [
+ {
+ "type": "m.typing",
+ "room_id": self.room_id,
+ "content": {"user_ids": [self.u_onion.to_string()]},
+ }
+ ],
)
- self.assertEquals(events[0], [{
- "type": "m.typing",
- "room_id": self.room_id,
- "content": {
- "user_ids": [self.u_onion.to_string()],
- },
- }])
@defer.inlineCallbacks
def test_stopped_typing(self):
@@ -278,17 +271,18 @@ class TypingNotificationsTestCase(unittest.TestCase):
"room_id": self.room_id,
"user_id": self.u_apple.to_string(),
"typing": False,
- }
+ },
),
json_data_callback=ANY,
long_retries=True,
backoff_on_404=True,
),
- defer.succeed((200, "OK"))
+ defer.succeed((200, "OK")),
)
# Gut-wrenching
from synapse.handlers.typing import RoomMember
+
member = RoomMember(self.room_id, self.u_apple.to_string())
self.handler._member_typing_until[member] = 1002000
self.handler._room_typing[self.room_id] = set([self.u_apple.to_string()])
@@ -296,29 +290,29 @@ class TypingNotificationsTestCase(unittest.TestCase):
self.assertEquals(self.event_source.get_current_key(), 0)
yield self.handler.stopped_typing(
- target_user=self.u_apple,
- auth_user=self.u_apple,
- room_id=self.room_id,
+ target_user=self.u_apple, auth_user=self.u_apple, room_id=self.room_id
)
- self.on_new_event.assert_has_calls([
- call('typing_key', 1, rooms=[self.room_id]),
- ])
+ self.on_new_event.assert_has_calls(
+ [call('typing_key', 1, rooms=[self.room_id])]
+ )
yield put_json.await_calls()
self.assertEquals(self.event_source.get_current_key(), 1)
events = yield self.event_source.get_new_events(
- room_ids=[self.room_id],
- from_key=0,
+ room_ids=[self.room_id], from_key=0
+ )
+ self.assertEquals(
+ events[0],
+ [
+ {
+ "type": "m.typing",
+ "room_id": self.room_id,
+ "content": {"user_ids": []},
+ }
+ ],
)
- self.assertEquals(events[0], [{
- "type": "m.typing",
- "room_id": self.room_id,
- "content": {
- "user_ids": [],
- },
- }])
@defer.inlineCallbacks
def test_typing_timeout(self):
@@ -333,42 +327,46 @@ class TypingNotificationsTestCase(unittest.TestCase):
timeout=10000,
)
- self.on_new_event.assert_has_calls([
- call('typing_key', 1, rooms=[self.room_id]),
- ])
+ self.on_new_event.assert_has_calls(
+ [call('typing_key', 1, rooms=[self.room_id])]
+ )
self.on_new_event.reset_mock()
self.assertEquals(self.event_source.get_current_key(), 1)
events = yield self.event_source.get_new_events(
- room_ids=[self.room_id],
- from_key=0,
+ room_ids=[self.room_id], from_key=0
+ )
+ self.assertEquals(
+ events[0],
+ [
+ {
+ "type": "m.typing",
+ "room_id": self.room_id,
+ "content": {"user_ids": [self.u_apple.to_string()]},
+ }
+ ],
)
- self.assertEquals(events[0], [{
- "type": "m.typing",
- "room_id": self.room_id,
- "content": {
- "user_ids": [self.u_apple.to_string()],
- },
- }])
self.clock.advance_time(16)
- self.on_new_event.assert_has_calls([
- call('typing_key', 2, rooms=[self.room_id]),
- ])
+ self.on_new_event.assert_has_calls(
+ [call('typing_key', 2, rooms=[self.room_id])]
+ )
self.assertEquals(self.event_source.get_current_key(), 2)
events = yield self.event_source.get_new_events(
- room_ids=[self.room_id],
- from_key=1,
+ room_ids=[self.room_id], from_key=1
+ )
+ self.assertEquals(
+ events[0],
+ [
+ {
+ "type": "m.typing",
+ "room_id": self.room_id,
+ "content": {"user_ids": []},
+ }
+ ],
)
- self.assertEquals(events[0], [{
- "type": "m.typing",
- "room_id": self.room_id,
- "content": {
- "user_ids": [],
- },
- }])
# SYN-230 - see if we can still set after timeout
@@ -379,20 +377,22 @@ class TypingNotificationsTestCase(unittest.TestCase):
timeout=10000,
)
- self.on_new_event.assert_has_calls([
- call('typing_key', 3, rooms=[self.room_id]),
- ])
+ self.on_new_event.assert_has_calls(
+ [call('typing_key', 3, rooms=[self.room_id])]
+ )
self.on_new_event.reset_mock()
self.assertEquals(self.event_source.get_current_key(), 3)
events = yield self.event_source.get_new_events(
- room_ids=[self.room_id],
- from_key=0,
+ room_ids=[self.room_id], from_key=0
+ )
+ self.assertEquals(
+ events[0],
+ [
+ {
+ "type": "m.typing",
+ "room_id": self.room_id,
+ "content": {"user_ids": [self.u_apple.to_string()]},
+ }
+ ],
)
- self.assertEquals(events[0], [{
- "type": "m.typing",
- "room_id": self.room_id,
- "content": {
- "user_ids": [self.u_apple.to_string()],
- },
- }])
|
