diff --git a/tests/handlers/test_appservice.py b/tests/handlers/test_appservice.py
index 57c0771cf3..ba7148ec01 100644
--- a/tests/handlers/test_appservice.py
+++ b/tests/handlers/test_appservice.py
@@ -45,20 +45,18 @@ class AppServiceHandlerTestCase(unittest.TestCase):
services = [
self._mkservice(is_interested=False),
interested_service,
- self._mkservice(is_interested=False)
+ self._mkservice(is_interested=False),
]
self.mock_store.get_app_services = Mock(return_value=services)
self.mock_store.get_user_by_id = Mock(return_value=[])
event = Mock(
- sender="@someone:anywhere",
- type="m.room.message",
- room_id="!foo:bar"
+ sender="@someone:anywhere", type="m.room.message", room_id="!foo:bar"
)
self.mock_store.get_new_events_for_appservice.side_effect = [
(0, [event]),
- (0, [])
+ (0, []),
]
self.mock_as_api.push = Mock()
yield self.handler.notify_interested_services(0)
@@ -74,21 +72,15 @@ class AppServiceHandlerTestCase(unittest.TestCase):
self.mock_store.get_app_services = Mock(return_value=services)
self.mock_store.get_user_by_id = Mock(return_value=None)
- event = Mock(
- sender=user_id,
- type="m.room.message",
- room_id="!foo:bar"
- )
+ event = Mock(sender=user_id, type="m.room.message", room_id="!foo:bar")
self.mock_as_api.push = Mock()
self.mock_as_api.query_user = Mock()
self.mock_store.get_new_events_for_appservice.side_effect = [
(0, [event]),
- (0, [])
+ (0, []),
]
yield self.handler.notify_interested_services(0)
- self.mock_as_api.query_user.assert_called_once_with(
- services[0], user_id
- )
+ self.mock_as_api.query_user.assert_called_once_with(services[0], user_id)
@defer.inlineCallbacks
def test_query_user_exists_known_user(self):
@@ -96,25 +88,19 @@ class AppServiceHandlerTestCase(unittest.TestCase):
services = [self._mkservice(is_interested=True)]
services[0].is_interested_in_user = Mock(return_value=True)
self.mock_store.get_app_services = Mock(return_value=services)
- self.mock_store.get_user_by_id = Mock(return_value={
- "name": user_id
- })
+ self.mock_store.get_user_by_id = Mock(return_value={"name": user_id})
- event = Mock(
- sender=user_id,
- type="m.room.message",
- room_id="!foo:bar"
- )
+ event = Mock(sender=user_id, type="m.room.message", room_id="!foo:bar")
self.mock_as_api.push = Mock()
self.mock_as_api.query_user = Mock()
self.mock_store.get_new_events_for_appservice.side_effect = [
(0, [event]),
- (0, [])
+ (0, []),
]
yield self.handler.notify_interested_services(0)
self.assertFalse(
self.mock_as_api.query_user.called,
- "query_user called when it shouldn't have been."
+ "query_user called when it shouldn't have been.",
)
@defer.inlineCallbacks
@@ -129,7 +115,7 @@ class AppServiceHandlerTestCase(unittest.TestCase):
services = [
self._mkservice_alias(is_interested_in_alias=False),
interested_service,
- self._mkservice_alias(is_interested_in_alias=False)
+ self._mkservice_alias(is_interested_in_alias=False),
]
self.mock_store.get_app_services = Mock(return_value=services)
@@ -140,8 +126,7 @@ class AppServiceHandlerTestCase(unittest.TestCase):
result = yield self.handler.query_room_alias_exists(room_alias)
self.mock_as_api.query_alias.assert_called_once_with(
- interested_service,
- room_alias_str
+ interested_service, room_alias_str
)
self.assertEquals(result.room_id, room_id)
self.assertEquals(result.servers, servers)
diff --git a/tests/handlers/test_auth.py b/tests/handlers/test_auth.py
index 8a9bf2d5fd..3046bd6093 100644
--- a/tests/handlers/test_auth.py
+++ b/tests/handlers/test_auth.py
@@ -35,7 +35,7 @@ class AuthHandlers(object):
class AuthTestCase(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.macaroon_generator = self.hs.get_macaroon_generator()
@@ -81,9 +81,7 @@ class AuthTestCase(unittest.TestCase):
def test_short_term_login_token_gives_user_id(self):
self.hs.clock.now = 1000
- token = self.macaroon_generator.generate_short_term_login_token(
- "a_user", 5000
- )
+ token = self.macaroon_generator.generate_short_term_login_token("a_user", 5000)
user_id = yield self.auth_handler.validate_short_term_login_token_and_get_user_id(
token
)
@@ -98,17 +96,13 @@ class AuthTestCase(unittest.TestCase):
@defer.inlineCallbacks
def test_short_term_login_token_cannot_replace_user_id(self):
- token = self.macaroon_generator.generate_short_term_login_token(
- "a_user", 5000
- )
+ token = self.macaroon_generator.generate_short_term_login_token("a_user", 5000)
macaroon = pymacaroons.Macaroon.deserialize(token)
user_id = yield self.auth_handler.validate_short_term_login_token_and_get_user_id(
macaroon.serialize()
)
- self.assertEqual(
- "a_user", user_id
- )
+ self.assertEqual("a_user", user_id)
# add another "user_id" caveat, which might allow us to override the
# user_id.
@@ -130,7 +124,7 @@ class AuthTestCase(unittest.TestCase):
)
@defer.inlineCallbacks
- def test_mau_limits_exceeded(self):
+ def test_mau_limits_exceeded_large(self):
self.hs.config.limit_usage_by_mau = True
self.hs.get_datastore().get_monthly_active_count = Mock(
return_value=defer.succeed(self.large_number_of_users)
@@ -148,6 +142,42 @@ class AuthTestCase(unittest.TestCase):
)
@defer.inlineCallbacks
+ def test_mau_limits_parity(self):
+ self.hs.config.limit_usage_by_mau = True
+
+ # If not in monthly active cohort
+ self.hs.get_datastore().get_monthly_active_count = Mock(
+ return_value=defer.succeed(self.hs.config.max_mau_value)
+ )
+ with self.assertRaises(AuthError):
+ yield self.auth_handler.get_access_token_for_user_id('user_a')
+
+ self.hs.get_datastore().get_monthly_active_count = Mock(
+ return_value=defer.succeed(self.hs.config.max_mau_value)
+ )
+ with self.assertRaises(AuthError):
+ yield self.auth_handler.validate_short_term_login_token_and_get_user_id(
+ self._get_macaroon().serialize()
+ )
+ # If in monthly active cohort
+ self.hs.get_datastore().user_last_seen_monthly_active = Mock(
+ return_value=defer.succeed(self.hs.get_clock().time_msec())
+ )
+ self.hs.get_datastore().get_monthly_active_count = Mock(
+ return_value=defer.succeed(self.hs.config.max_mau_value)
+ )
+ yield self.auth_handler.get_access_token_for_user_id('user_a')
+ self.hs.get_datastore().user_last_seen_monthly_active = Mock(
+ return_value=defer.succeed(self.hs.get_clock().time_msec())
+ )
+ self.hs.get_datastore().get_monthly_active_count = Mock(
+ return_value=defer.succeed(self.hs.config.max_mau_value)
+ )
+ yield self.auth_handler.validate_short_term_login_token_and_get_user_id(
+ self._get_macaroon().serialize()
+ )
+
+ @defer.inlineCallbacks
def test_mau_limits_not_exceeded(self):
self.hs.config.limit_usage_by_mau = True
@@ -165,7 +195,5 @@ class AuthTestCase(unittest.TestCase):
)
def _get_macaroon(self):
- token = self.macaroon_generator.generate_short_term_login_token(
- "user_a", 5000
- )
+ token = self.macaroon_generator.generate_short_term_login_token("user_a", 5000)
return pymacaroons.Macaroon.deserialize(token)
diff --git a/tests/handlers/test_device.py b/tests/handlers/test_device.py
index 633a0b7f36..56e7acd37c 100644
--- a/tests/handlers/test_device.py
+++ b/tests/handlers/test_device.py
@@ -28,13 +28,13 @@ user2 = "@theresa:bbb"
class DeviceTestCase(unittest.TestCase):
def __init__(self, *args, **kwargs):
super(DeviceTestCase, self).__init__(*args, **kwargs)
- self.store = None # type: synapse.storage.DataStore
+ self.store = None # type: synapse.storage.DataStore
self.handler = None # type: synapse.handlers.device.DeviceHandler
- self.clock = None # type: utils.MockClock
+ self.clock = None # type: utils.MockClock
@defer.inlineCallbacks
def setUp(self):
- hs = yield utils.setup_test_homeserver()
+ hs = yield utils.setup_test_homeserver(self.addCleanup)
self.handler = hs.get_device_handler()
self.store = hs.get_datastore()
self.clock = hs.get_clock()
@@ -44,7 +44,7 @@ class DeviceTestCase(unittest.TestCase):
res = yield self.handler.check_device_registered(
user_id="@boris:foo",
device_id="fco",
- initial_device_display_name="display name"
+ initial_device_display_name="display name",
)
self.assertEqual(res, "fco")
@@ -56,14 +56,14 @@ class DeviceTestCase(unittest.TestCase):
res1 = yield self.handler.check_device_registered(
user_id="@boris:foo",
device_id="fco",
- initial_device_display_name="display name"
+ initial_device_display_name="display name",
)
self.assertEqual(res1, "fco")
res2 = yield self.handler.check_device_registered(
user_id="@boris:foo",
device_id="fco",
- initial_device_display_name="new display name"
+ initial_device_display_name="new display name",
)
self.assertEqual(res2, "fco")
@@ -75,7 +75,7 @@ class DeviceTestCase(unittest.TestCase):
device_id = yield self.handler.check_device_registered(
user_id="@theresa:foo",
device_id=None,
- initial_device_display_name="display"
+ initial_device_display_name="display",
)
dev = yield self.handler.store.get_device("@theresa:foo", device_id)
@@ -87,43 +87,53 @@ class DeviceTestCase(unittest.TestCase):
res = yield self.handler.get_devices_by_user(user1)
self.assertEqual(3, len(res))
- device_map = {
- d["device_id"]: d for d in res
- }
- self.assertDictContainsSubset({
- "user_id": user1,
- "device_id": "xyz",
- "display_name": "display 0",
- "last_seen_ip": None,
- "last_seen_ts": None,
- }, device_map["xyz"])
- self.assertDictContainsSubset({
- "user_id": user1,
- "device_id": "fco",
- "display_name": "display 1",
- "last_seen_ip": "ip1",
- "last_seen_ts": 1000000,
- }, device_map["fco"])
- self.assertDictContainsSubset({
- "user_id": user1,
- "device_id": "abc",
- "display_name": "display 2",
- "last_seen_ip": "ip3",
- "last_seen_ts": 3000000,
- }, device_map["abc"])
+ device_map = {d["device_id"]: d for d in res}
+ self.assertDictContainsSubset(
+ {
+ "user_id": user1,
+ "device_id": "xyz",
+ "display_name": "display 0",
+ "last_seen_ip": None,
+ "last_seen_ts": None,
+ },
+ device_map["xyz"],
+ )
+ self.assertDictContainsSubset(
+ {
+ "user_id": user1,
+ "device_id": "fco",
+ "display_name": "display 1",
+ "last_seen_ip": "ip1",
+ "last_seen_ts": 1000000,
+ },
+ device_map["fco"],
+ )
+ self.assertDictContainsSubset(
+ {
+ "user_id": user1,
+ "device_id": "abc",
+ "display_name": "display 2",
+ "last_seen_ip": "ip3",
+ "last_seen_ts": 3000000,
+ },
+ device_map["abc"],
+ )
@defer.inlineCallbacks
def test_get_device(self):
yield self._record_users()
res = yield self.handler.get_device(user1, "abc")
- self.assertDictContainsSubset({
- "user_id": user1,
- "device_id": "abc",
- "display_name": "display 2",
- "last_seen_ip": "ip3",
- "last_seen_ts": 3000000,
- }, res)
+ self.assertDictContainsSubset(
+ {
+ "user_id": user1,
+ "device_id": "abc",
+ "display_name": "display 2",
+ "last_seen_ip": "ip3",
+ "last_seen_ts": 3000000,
+ },
+ res,
+ )
@defer.inlineCallbacks
def test_delete_device(self):
@@ -153,8 +163,7 @@ class DeviceTestCase(unittest.TestCase):
def test_update_unknown_device(self):
update = {"display_name": "new_display"}
with self.assertRaises(synapse.api.errors.NotFoundError):
- yield self.handler.update_device("user_id", "unknown_device_id",
- update)
+ yield self.handler.update_device("user_id", "unknown_device_id", update)
@defer.inlineCallbacks
def _record_users(self):
@@ -168,16 +177,17 @@ class DeviceTestCase(unittest.TestCase):
yield self._record_user(user2, "def", "dispkay", "token4", "ip4")
@defer.inlineCallbacks
- def _record_user(self, user_id, device_id, display_name,
- access_token=None, ip=None):
+ def _record_user(
+ self, user_id, device_id, display_name, access_token=None, ip=None
+ ):
device_id = yield self.handler.check_device_registered(
user_id=user_id,
device_id=device_id,
- initial_device_display_name=display_name
+ initial_device_display_name=display_name,
)
if ip is not None:
yield self.store.insert_client_ip(
- user_id,
- access_token, ip, "user_agent", device_id)
+ user_id, access_token, ip, "user_agent", device_id
+ )
self.clock.advance_time(1000)
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py
index a353070316..ec7355688b 100644
--- a/tests/handlers/test_directory.py
+++ b/tests/handlers/test_directory.py
@@ -42,9 +42,11 @@ class DirectoryTestCase(unittest.TestCase):
def register_query_handler(query_type, handler):
self.query_handlers[query_type] = handler
+
self.mock_registry.register_query_handler = register_query_handler
hs = yield setup_test_homeserver(
+ self.addCleanup,
http_client=None,
resource_for_federation=Mock(),
federation_client=self.mock_federation,
@@ -68,10 +70,7 @@ class DirectoryTestCase(unittest.TestCase):
result = yield self.handler.get_association(self.my_room)
- self.assertEquals({
- "room_id": "!8765qwer:test",
- "servers": ["test"],
- }, result)
+ self.assertEquals({"room_id": "!8765qwer:test", "servers": ["test"]}, result)
@defer.inlineCallbacks
def test_get_remote_association(self):
@@ -81,16 +80,13 @@ class DirectoryTestCase(unittest.TestCase):
result = yield self.handler.get_association(self.remote_room)
- self.assertEquals({
- "room_id": "!8765qwer:test",
- "servers": ["test", "remote"],
- }, result)
+ self.assertEquals(
+ {"room_id": "!8765qwer:test", "servers": ["test", "remote"]}, result
+ )
self.mock_federation.make_query.assert_called_with(
destination="remote",
query_type="directory",
- args={
- "room_alias": "#another:remote",
- },
+ args={"room_alias": "#another:remote"},
retry_on_dns_fail=False,
ignore_backoff=True,
)
@@ -105,7 +101,4 @@ class DirectoryTestCase(unittest.TestCase):
{"room_alias": "#your-room:test"}
)
- self.assertEquals({
- "room_id": "!8765asdf:test",
- "servers": ["test"],
- }, response)
+ self.assertEquals({"room_id": "!8765asdf:test", "servers": ["test"]}, response)
diff --git a/tests/handlers/test_e2e_keys.py b/tests/handlers/test_e2e_keys.py
index ca1542236d..8dccc6826e 100644
--- a/tests/handlers/test_e2e_keys.py
+++ b/tests/handlers/test_e2e_keys.py
@@ -28,14 +28,13 @@ from tests import unittest, utils
class E2eKeysHandlerTestCase(unittest.TestCase):
def __init__(self, *args, **kwargs):
super(E2eKeysHandlerTestCase, self).__init__(*args, **kwargs)
- self.hs = None # type: synapse.server.HomeServer
+ self.hs = None # type: synapse.server.HomeServer
self.handler = None # type: synapse.handlers.e2e_keys.E2eKeysHandler
@defer.inlineCallbacks
def setUp(self):
self.hs = yield utils.setup_test_homeserver(
- handlers=None,
- federation_client=mock.Mock(),
+ self.addCleanup, handlers=None, federation_client=mock.Mock()
)
self.handler = synapse.handlers.e2e_keys.E2eKeysHandler(self.hs)
@@ -54,30 +53,21 @@ class E2eKeysHandlerTestCase(unittest.TestCase):
device_id = "xyz"
keys = {
"alg1:k1": "key1",
- "alg2:k2": {
- "key": "key2",
- "signatures": {"k1": "sig1"}
- },
- "alg2:k3": {
- "key": "key3",
- },
+ "alg2:k2": {"key": "key2", "signatures": {"k1": "sig1"}},
+ "alg2:k3": {"key": "key3"},
}
res = yield self.handler.upload_keys_for_user(
- local_user, device_id, {"one_time_keys": keys},
+ local_user, device_id, {"one_time_keys": keys}
)
- self.assertDictEqual(res, {
- "one_time_key_counts": {"alg1": 1, "alg2": 2}
- })
+ self.assertDictEqual(res, {"one_time_key_counts": {"alg1": 1, "alg2": 2}})
# we should be able to change the signature without a problem
keys["alg2:k2"]["signatures"]["k1"] = "sig2"
res = yield self.handler.upload_keys_for_user(
- local_user, device_id, {"one_time_keys": keys},
+ local_user, device_id, {"one_time_keys": keys}
)
- self.assertDictEqual(res, {
- "one_time_key_counts": {"alg1": 1, "alg2": 2}
- })
+ self.assertDictEqual(res, {"one_time_key_counts": {"alg1": 1, "alg2": 2}})
@defer.inlineCallbacks
def test_change_one_time_keys(self):
@@ -87,25 +77,18 @@ class E2eKeysHandlerTestCase(unittest.TestCase):
device_id = "xyz"
keys = {
"alg1:k1": "key1",
- "alg2:k2": {
- "key": "key2",
- "signatures": {"k1": "sig1"}
- },
- "alg2:k3": {
- "key": "key3",
- },
+ "alg2:k2": {"key": "key2", "signatures": {"k1": "sig1"}},
+ "alg2:k3": {"key": "key3"},
}
res = yield self.handler.upload_keys_for_user(
- local_user, device_id, {"one_time_keys": keys},
+ local_user, device_id, {"one_time_keys": keys}
)
- self.assertDictEqual(res, {
- "one_time_key_counts": {"alg1": 1, "alg2": 2}
- })
+ self.assertDictEqual(res, {"one_time_key_counts": {"alg1": 1, "alg2": 2}})
try:
yield self.handler.upload_keys_for_user(
- local_user, device_id, {"one_time_keys": {"alg1:k1": "key2"}},
+ local_user, device_id, {"one_time_keys": {"alg1:k1": "key2"}}
)
self.fail("No error when changing string key")
except errors.SynapseError:
@@ -113,7 +96,7 @@ class E2eKeysHandlerTestCase(unittest.TestCase):
try:
yield self.handler.upload_keys_for_user(
- local_user, device_id, {"one_time_keys": {"alg2:k3": "key2"}},
+ local_user, device_id, {"one_time_keys": {"alg2:k3": "key2"}}
)
self.fail("No error when replacing dict key with string")
except errors.SynapseError:
@@ -121,9 +104,7 @@ class E2eKeysHandlerTestCase(unittest.TestCase):
try:
yield self.handler.upload_keys_for_user(
- local_user, device_id, {
- "one_time_keys": {"alg1:k1": {"key": "key"}}
- },
+ local_user, device_id, {"one_time_keys": {"alg1:k1": {"key": "key"}}}
)
self.fail("No error when replacing string key with dict")
except errors.SynapseError:
@@ -131,13 +112,12 @@ class E2eKeysHandlerTestCase(unittest.TestCase):
try:
yield self.handler.upload_keys_for_user(
- local_user, device_id, {
+ local_user,
+ device_id,
+ {
"one_time_keys": {
- "alg2:k2": {
- "key": "key3",
- "signatures": {"k1": "sig1"},
- }
- },
+ "alg2:k2": {"key": "key3", "signatures": {"k1": "sig1"}}
+ }
},
)
self.fail("No error when replacing dict key")
@@ -148,31 +128,20 @@ class E2eKeysHandlerTestCase(unittest.TestCase):
def test_claim_one_time_key(self):
local_user = "@boris:" + self.hs.hostname
device_id = "xyz"
- keys = {
- "alg1:k1": "key1",
- }
+ keys = {"alg1:k1": "key1"}
res = yield self.handler.upload_keys_for_user(
- local_user, device_id, {"one_time_keys": keys},
+ local_user, device_id, {"one_time_keys": keys}
+ )
+ self.assertDictEqual(res, {"one_time_key_counts": {"alg1": 1}})
+
+ res2 = yield self.handler.claim_one_time_keys(
+ {"one_time_keys": {local_user: {device_id: "alg1"}}}, timeout=None
+ )
+ self.assertEqual(
+ res2,
+ {
+ "failures": {},
+ "one_time_keys": {local_user: {device_id: {"alg1:k1": "key1"}}},
+ },
)
- self.assertDictEqual(res, {
- "one_time_key_counts": {"alg1": 1}
- })
-
- res2 = yield self.handler.claim_one_time_keys({
- "one_time_keys": {
- local_user: {
- device_id: "alg1"
- }
- }
- }, timeout=None)
- self.assertEqual(res2, {
- "failures": {},
- "one_time_keys": {
- local_user: {
- device_id: {
- "alg1:k1": "key1"
- }
- }
- }
- })
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index 121ce78634..fc2b646ba2 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -39,8 +39,7 @@ class PresenceUpdateTestCase(unittest.TestCase):
prev_state = UserPresenceState.default(user_id)
new_state = prev_state.copy_and_replace(
- state=PresenceState.ONLINE,
- last_active_ts=now,
+ state=PresenceState.ONLINE, last_active_ts=now
)
state, persist_and_notify, federation_ping = handle_update(
@@ -54,23 +53,22 @@ class PresenceUpdateTestCase(unittest.TestCase):
self.assertEquals(state.last_federation_update_ts, now)
self.assertEquals(wheel_timer.insert.call_count, 3)
- wheel_timer.insert.assert_has_calls([
- call(
- now=now,
- obj=user_id,
- then=new_state.last_active_ts + IDLE_TIMER
- ),
- call(
- now=now,
- obj=user_id,
- then=new_state.last_user_sync_ts + SYNC_ONLINE_TIMEOUT
- ),
- call(
- now=now,
- obj=user_id,
- then=new_state.last_active_ts + LAST_ACTIVE_GRANULARITY
- ),
- ], any_order=True)
+ wheel_timer.insert.assert_has_calls(
+ [
+ call(now=now, obj=user_id, then=new_state.last_active_ts + IDLE_TIMER),
+ call(
+ now=now,
+ obj=user_id,
+ then=new_state.last_user_sync_ts + SYNC_ONLINE_TIMEOUT,
+ ),
+ call(
+ now=now,
+ obj=user_id,
+ then=new_state.last_active_ts + LAST_ACTIVE_GRANULARITY,
+ ),
+ ],
+ any_order=True,
+ )
def test_online_to_online(self):
wheel_timer = Mock()
@@ -79,14 +77,11 @@ class PresenceUpdateTestCase(unittest.TestCase):
prev_state = UserPresenceState.default(user_id)
prev_state = prev_state.copy_and_replace(
- state=PresenceState.ONLINE,
- last_active_ts=now,
- currently_active=True,
+ state=PresenceState.ONLINE, last_active_ts=now, currently_active=True
)
new_state = prev_state.copy_and_replace(
- state=PresenceState.ONLINE,
- last_active_ts=now,
+ state=PresenceState.ONLINE, last_active_ts=now
)
state, persist_and_notify, federation_ping = handle_update(
@@ -101,23 +96,22 @@ class PresenceUpdateTestCase(unittest.TestCase):
self.assertEquals(state.last_federation_update_ts, now)
self.assertEquals(wheel_timer.insert.call_count, 3)
- wheel_timer.insert.assert_has_calls([
- call(
- now=now,
- obj=user_id,
- then=new_state.last_active_ts + IDLE_TIMER
- ),
- call(
- now=now,
- obj=user_id,
- then=new_state.last_user_sync_ts + SYNC_ONLINE_TIMEOUT
- ),
- call(
- now=now,
- obj=user_id,
- then=new_state.last_active_ts + LAST_ACTIVE_GRANULARITY
- ),
- ], any_order=True)
+ wheel_timer.insert.assert_has_calls(
+ [
+ call(now=now, obj=user_id, then=new_state.last_active_ts + IDLE_TIMER),
+ call(
+ now=now,
+ obj=user_id,
+ then=new_state.last_user_sync_ts + SYNC_ONLINE_TIMEOUT,
+ ),
+ call(
+ now=now,
+ obj=user_id,
+ then=new_state.last_active_ts + LAST_ACTIVE_GRANULARITY,
+ ),
+ ],
+ any_order=True,
+ )
def test_online_to_online_last_active_noop(self):
wheel_timer = Mock()
@@ -132,8 +126,7 @@ class PresenceUpdateTestCase(unittest.TestCase):
)
new_state = prev_state.copy_and_replace(
- state=PresenceState.ONLINE,
- last_active_ts=now,
+ state=PresenceState.ONLINE, last_active_ts=now
)
state, persist_and_notify, federation_ping = handle_update(
@@ -148,23 +141,22 @@ class PresenceUpdateTestCase(unittest.TestCase):
self.assertEquals(state.last_federation_update_ts, now)
self.assertEquals(wheel_timer.insert.call_count, 3)
- wheel_timer.insert.assert_has_calls([
- call(
- now=now,
- obj=user_id,
- then=new_state.last_active_ts + IDLE_TIMER
- ),
- call(
- now=now,
- obj=user_id,
- then=new_state.last_user_sync_ts + SYNC_ONLINE_TIMEOUT
- ),
- call(
- now=now,
- obj=user_id,
- then=new_state.last_active_ts + LAST_ACTIVE_GRANULARITY
- ),
- ], any_order=True)
+ wheel_timer.insert.assert_has_calls(
+ [
+ call(now=now, obj=user_id, then=new_state.last_active_ts + IDLE_TIMER),
+ call(
+ now=now,
+ obj=user_id,
+ then=new_state.last_user_sync_ts + SYNC_ONLINE_TIMEOUT,
+ ),
+ call(
+ now=now,
+ obj=user_id,
+ then=new_state.last_active_ts + LAST_ACTIVE_GRANULARITY,
+ ),
+ ],
+ any_order=True,
+ )
def test_online_to_online_last_active(self):
wheel_timer = Mock()
@@ -178,9 +170,7 @@ class PresenceUpdateTestCase(unittest.TestCase):
currently_active=True,
)
- new_state = prev_state.copy_and_replace(
- state=PresenceState.ONLINE,
- )
+ new_state = prev_state.copy_and_replace(state=PresenceState.ONLINE)
state, persist_and_notify, federation_ping = handle_update(
prev_state, new_state, is_mine=True, wheel_timer=wheel_timer, now=now
@@ -193,18 +183,17 @@ class PresenceUpdateTestCase(unittest.TestCase):
self.assertEquals(state.last_federation_update_ts, now)
self.assertEquals(wheel_timer.insert.call_count, 2)
- wheel_timer.insert.assert_has_calls([
- call(
- now=now,
- obj=user_id,
- then=new_state.last_active_ts + IDLE_TIMER
- ),
- call(
- now=now,
- obj=user_id,
- then=new_state.last_user_sync_ts + SYNC_ONLINE_TIMEOUT
- )
- ], any_order=True)
+ wheel_timer.insert.assert_has_calls(
+ [
+ call(now=now, obj=user_id, then=new_state.last_active_ts + IDLE_TIMER),
+ call(
+ now=now,
+ obj=user_id,
+ then=new_state.last_user_sync_ts + SYNC_ONLINE_TIMEOUT,
+ ),
+ ],
+ any_order=True,
+ )
def test_remote_ping_timer(self):
wheel_timer = Mock()
@@ -213,13 +202,10 @@ class PresenceUpdateTestCase(unittest.TestCase):
prev_state = UserPresenceState.default(user_id)
prev_state = prev_state.copy_and_replace(
- state=PresenceState.ONLINE,
- last_active_ts=now,
+ state=PresenceState.ONLINE, last_active_ts=now
)
- new_state = prev_state.copy_and_replace(
- state=PresenceState.ONLINE,
- )
+ new_state = prev_state.copy_and_replace(state=PresenceState.ONLINE)
state, persist_and_notify, federation_ping = handle_update(
prev_state, new_state, is_mine=False, wheel_timer=wheel_timer, now=now
@@ -232,13 +218,16 @@ class PresenceUpdateTestCase(unittest.TestCase):
self.assertEquals(new_state.status_msg, state.status_msg)
self.assertEquals(wheel_timer.insert.call_count, 1)
- wheel_timer.insert.assert_has_calls([
- call(
- now=now,
- obj=user_id,
- then=new_state.last_federation_update_ts + FEDERATION_TIMEOUT
- ),
- ], any_order=True)
+ wheel_timer.insert.assert_has_calls(
+ [
+ call(
+ now=now,
+ obj=user_id,
+ then=new_state.last_federation_update_ts + FEDERATION_TIMEOUT,
+ )
+ ],
+ any_order=True,
+ )
def test_online_to_offline(self):
wheel_timer = Mock()
@@ -247,14 +236,10 @@ class PresenceUpdateTestCase(unittest.TestCase):
prev_state = UserPresenceState.default(user_id)
prev_state = prev_state.copy_and_replace(
- state=PresenceState.ONLINE,
- last_active_ts=now,
- currently_active=True,
+ state=PresenceState.ONLINE, last_active_ts=now, currently_active=True
)
- new_state = prev_state.copy_and_replace(
- state=PresenceState.OFFLINE,
- )
+ new_state = prev_state.copy_and_replace(state=PresenceState.OFFLINE)
state, persist_and_notify, federation_ping = handle_update(
prev_state, new_state, is_mine=True, wheel_timer=wheel_timer, now=now
@@ -273,14 +258,10 @@ class PresenceUpdateTestCase(unittest.TestCase):
prev_state = UserPresenceState.default(user_id)
prev_state = prev_state.copy_and_replace(
- state=PresenceState.ONLINE,
- last_active_ts=now,
- currently_active=True,
+ state=PresenceState.ONLINE, last_active_ts=now, currently_active=True
)
- new_state = prev_state.copy_and_replace(
- state=PresenceState.UNAVAILABLE,
- )
+ new_state = prev_state.copy_and_replace(state=PresenceState.UNAVAILABLE)
state, persist_and_notify, federation_ping = handle_update(
prev_state, new_state, is_mine=True, wheel_timer=wheel_timer, now=now
@@ -293,13 +274,16 @@ class PresenceUpdateTestCase(unittest.TestCase):
self.assertEquals(new_state.status_msg, state.status_msg)
self.assertEquals(wheel_timer.insert.call_count, 1)
- wheel_timer.insert.assert_has_calls([
- call(
- now=now,
- obj=user_id,
- then=new_state.last_user_sync_ts + SYNC_ONLINE_TIMEOUT
- )
- ], any_order=True)
+ wheel_timer.insert.assert_has_calls(
+ [
+ call(
+ now=now,
+ obj=user_id,
+ then=new_state.last_user_sync_ts + SYNC_ONLINE_TIMEOUT,
+ )
+ ],
+ any_order=True,
+ )
class PresenceTimeoutTestCase(unittest.TestCase):
@@ -314,9 +298,7 @@ class PresenceTimeoutTestCase(unittest.TestCase):
last_user_sync_ts=now,
)
- new_state = handle_timeout(
- state, is_mine=True, syncing_user_ids=set(), now=now
- )
+ new_state = handle_timeout(state, is_mine=True, syncing_user_ids=set(), now=now)
self.assertIsNotNone(new_state)
self.assertEquals(new_state.state, PresenceState.UNAVAILABLE)
@@ -332,9 +314,7 @@ class PresenceTimeoutTestCase(unittest.TestCase):
last_user_sync_ts=now - SYNC_ONLINE_TIMEOUT - 1,
)
- new_state = handle_timeout(
- state, is_mine=True, syncing_user_ids=set(), now=now
- )
+ new_state = handle_timeout(state, is_mine=True, syncing_user_ids=set(), now=now)
self.assertIsNotNone(new_state)
self.assertEquals(new_state.state, PresenceState.OFFLINE)
@@ -369,9 +349,7 @@ class PresenceTimeoutTestCase(unittest.TestCase):
last_federation_update_ts=now - FEDERATION_PING_INTERVAL - 1,
)
- new_state = handle_timeout(
- state, is_mine=True, syncing_user_ids=set(), now=now
- )
+ new_state = handle_timeout(state, is_mine=True, syncing_user_ids=set(), now=now)
self.assertIsNotNone(new_state)
self.assertEquals(new_state, new_state)
@@ -388,9 +366,7 @@ class PresenceTimeoutTestCase(unittest.TestCase):
last_federation_update_ts=now,
)
- new_state = handle_timeout(
- state, is_mine=True, syncing_user_ids=set(), now=now
- )
+ new_state = handle_timeout(state, is_mine=True, syncing_user_ids=set(), now=now)
self.assertIsNone(new_state)
@@ -425,9 +401,7 @@ class PresenceTimeoutTestCase(unittest.TestCase):
last_federation_update_ts=now,
)
- new_state = handle_timeout(
- state, is_mine=True, syncing_user_ids=set(), now=now
- )
+ new_state = handle_timeout(state, is_mine=True, syncing_user_ids=set(), now=now)
self.assertIsNotNone(new_state)
self.assertEquals(state, new_state)
diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py
index 07cf5f4c8e..80da1c8954 100644
--- a/tests/handlers/test_profile.py
+++ b/tests/handlers/test_profile.py
@@ -48,15 +48,14 @@ class ProfileTestCase(unittest.TestCase):
self.mock_registry.register_query_handler = register_query_handler
hs = yield setup_test_homeserver(
+ self.addCleanup,
http_client=None,
handlers=None,
resource_for_federation=Mock(),
federation_client=self.mock_federation,
federation_server=Mock(),
federation_registry=self.mock_registry,
- ratelimiter=NonCallableMock(spec_set=[
- "send_message",
- ])
+ ratelimiter=NonCallableMock(spec_set=["send_message"]),
)
self.ratelimiter = hs.get_ratelimiter()
@@ -74,9 +73,7 @@ class ProfileTestCase(unittest.TestCase):
@defer.inlineCallbacks
def test_get_my_name(self):
- yield self.store.set_profile_displayname(
- self.frank.localpart, "Frank"
- )
+ yield self.store.set_profile_displayname(self.frank.localpart, "Frank")
displayname = yield self.handler.get_displayname(self.frank)
@@ -85,22 +82,18 @@ class ProfileTestCase(unittest.TestCase):
@defer.inlineCallbacks
def test_set_my_name(self):
yield self.handler.set_displayname(
- self.frank,
- synapse.types.create_requester(self.frank),
- "Frank Jr."
+ self.frank, synapse.types.create_requester(self.frank), "Frank Jr."
)
self.assertEquals(
(yield self.store.get_profile_displayname(self.frank.localpart)),
- "Frank Jr."
+ "Frank Jr.",
)
@defer.inlineCallbacks
def test_set_my_name_noauth(self):
d = self.handler.set_displayname(
- self.frank,
- synapse.types.create_requester(self.bob),
- "Frank Jr."
+ self.frank, synapse.types.create_requester(self.bob), "Frank Jr."
)
yield self.assertFailure(d, AuthError)
@@ -145,11 +138,12 @@ class ProfileTestCase(unittest.TestCase):
@defer.inlineCallbacks
def test_set_my_avatar(self):
yield self.handler.set_avatar_url(
- self.frank, synapse.types.create_requester(self.frank),
- "http://my.server/pic.gif"
+ self.frank,
+ synapse.types.create_requester(self.frank),
+ "http://my.server/pic.gif",
)
self.assertEquals(
(yield self.store.get_profile_avatar_url(self.frank.localpart)),
- "http://my.server/pic.gif"
+ "http://my.server/pic.gif",
)
diff --git a/tests/handlers/test_register.py b/tests/handlers/test_register.py
index 4ea59a58de..7154816a34 100644
--- a/tests/handlers/test_register.py
+++ b/tests/handlers/test_register.py
@@ -17,7 +17,7 @@ from mock import Mock
from twisted.internet import defer
-from synapse.api.errors import RegistrationError
+from synapse.api.errors import AuthError
from synapse.handlers.register import RegistrationHandler
from synapse.types import UserID, create_requester
@@ -40,13 +40,15 @@ class RegistrationTestCase(unittest.TestCase):
self.mock_distributor.declare("registered_user")
self.mock_captcha_client = Mock()
self.hs = yield setup_test_homeserver(
+ self.addCleanup,
handlers=None,
http_client=None,
expire_access_token=True,
profile_handler=Mock(),
)
self.macaroon_generator = Mock(
- generate_access_token=Mock(return_value='secret'))
+ generate_access_token=Mock(return_value='secret')
+ )
self.hs.get_macaroon_generator = Mock(return_value=self.macaroon_generator)
self.hs.handlers = RegistrationHandlers(self.hs)
self.handler = self.hs.get_handlers().registration_handler
@@ -62,7 +64,8 @@ class RegistrationTestCase(unittest.TestCase):
user_id = "@someone:test"
requester = create_requester("@as:test")
result_user_id, result_token = yield self.handler.get_or_create_user(
- requester, local_part, display_name)
+ requester, local_part, display_name
+ )
self.assertEquals(result_user_id, user_id)
self.assertEquals(result_token, 'secret')
@@ -73,13 +76,15 @@ class RegistrationTestCase(unittest.TestCase):
yield store.register(
user_id=frank.to_string(),
token="jkv;g498752-43gj['eamb!-5",
- password_hash=None)
+ password_hash=None,
+ )
local_part = "frank"
display_name = "Frank"
user_id = "@frank:test"
requester = create_requester("@as:test")
result_user_id, result_token = yield self.handler.get_or_create_user(
- requester, local_part, display_name)
+ requester, local_part, display_name
+ )
self.assertEquals(result_user_id, user_id)
self.assertEquals(result_token, 'secret')
@@ -93,7 +98,7 @@ class RegistrationTestCase(unittest.TestCase):
def test_get_or_create_user_mau_not_blocked(self):
self.hs.config.limit_usage_by_mau = True
self.store.count_monthly_users = Mock(
- return_value=defer.succeed(self.small_number_of_users)
+ return_value=defer.succeed(self.hs.config.max_mau_value - 1)
)
# Ensure does not throw exception
yield self.handler.get_or_create_user("@user:server", 'c', "User")
@@ -104,7 +109,13 @@ class RegistrationTestCase(unittest.TestCase):
self.store.get_monthly_active_count = Mock(
return_value=defer.succeed(self.lots_of_users)
)
- with self.assertRaises(RegistrationError):
+ with self.assertRaises(AuthError):
+ yield self.handler.get_or_create_user("requester", 'b', "display_name")
+
+ self.store.get_monthly_active_count = Mock(
+ return_value=defer.succeed(self.hs.config.max_mau_value)
+ )
+ with self.assertRaises(AuthError):
yield self.handler.get_or_create_user("requester", 'b', "display_name")
@defer.inlineCallbacks
@@ -113,7 +124,13 @@ class RegistrationTestCase(unittest.TestCase):
self.store.get_monthly_active_count = Mock(
return_value=defer.succeed(self.lots_of_users)
)
- with self.assertRaises(RegistrationError):
+ with self.assertRaises(AuthError):
+ yield self.handler.register(localpart="local_part")
+
+ self.store.get_monthly_active_count = Mock(
+ return_value=defer.succeed(self.hs.config.max_mau_value)
+ )
+ with self.assertRaises(AuthError):
yield self.handler.register(localpart="local_part")
@defer.inlineCallbacks
@@ -122,5 +139,11 @@ class RegistrationTestCase(unittest.TestCase):
self.store.get_monthly_active_count = Mock(
return_value=defer.succeed(self.lots_of_users)
)
- with self.assertRaises(RegistrationError):
+ with self.assertRaises(AuthError):
+ yield self.handler.register_saml2(localpart="local_part")
+
+ self.store.get_monthly_active_count = Mock(
+ return_value=defer.succeed(self.hs.config.max_mau_value)
+ )
+ with self.assertRaises(AuthError):
yield self.handler.register_saml2(localpart="local_part")
diff --git a/tests/handlers/test_sync.py b/tests/handlers/test_sync.py
new file mode 100644
index 0000000000..33d861bd64
--- /dev/null
+++ b/tests/handlers/test_sync.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 New Vector Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from twisted.internet import defer
+
+from synapse.api.errors import AuthError, Codes
+from synapse.api.filtering import DEFAULT_FILTER_COLLECTION
+from synapse.handlers.sync import SyncConfig, SyncHandler
+from synapse.types import UserID
+
+import tests.unittest
+import tests.utils
+from tests.utils import setup_test_homeserver
+
+
+class SyncTestCase(tests.unittest.TestCase):
+ """ Tests Sync Handler. """
+
+ @defer.inlineCallbacks
+ def setUp(self):
+ self.hs = yield setup_test_homeserver(self.addCleanup)
+ self.sync_handler = SyncHandler(self.hs)
+ self.store = self.hs.get_datastore()
+
+ @defer.inlineCallbacks
+ def test_wait_for_sync_for_user_auth_blocking(self):
+
+ user_id1 = "@user1:server"
+ user_id2 = "@user2:server"
+ sync_config = self._generate_sync_config(user_id1)
+
+ self.hs.config.limit_usage_by_mau = True
+ self.hs.config.max_mau_value = 1
+
+ # Check that the happy case does not throw errors
+ yield self.store.upsert_monthly_active_user(user_id1)
+ yield self.sync_handler.wait_for_sync_for_user(sync_config)
+
+ # Test that global lock works
+ self.hs.config.hs_disabled = True
+ with self.assertRaises(AuthError) as e:
+ yield self.sync_handler.wait_for_sync_for_user(sync_config)
+ self.assertEquals(e.exception.errcode, Codes.RESOURCE_LIMIT_EXCEED)
+
+ self.hs.config.hs_disabled = False
+
+ sync_config = self._generate_sync_config(user_id2)
+
+ with self.assertRaises(AuthError) as e:
+ yield self.sync_handler.wait_for_sync_for_user(sync_config)
+ self.assertEquals(e.exception.errcode, Codes.RESOURCE_LIMIT_EXCEED)
+
+ def _generate_sync_config(self, user_id):
+ return SyncConfig(
+ user=UserID(user_id.split(":")[0][1:], user_id.split(":")[1]),
+ filter_collection=DEFAULT_FILTER_COLLECTION,
+ is_guest=False,
+ request_key="request_key",
+ device_id="device_id",
+ )
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()],
- },
- }])
|
