mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-03 02:51:57 +00:00
Add some tests for propagation of device list changes between local users (#11972)
This commit is contained in:
parent
c4c98c7518
commit
87f2005713
1
changelog.d/11972.misc
Normal file
1
changelog.d/11972.misc
Normal file
@ -0,0 +1 @@
|
|||||||
|
Add tests for device list changes between local users.
|
@ -138,7 +138,7 @@ class _NotifierUserStream:
|
|||||||
self.current_token = self.current_token.copy_and_advance(stream_key, stream_id)
|
self.current_token = self.current_token.copy_and_advance(stream_key, stream_id)
|
||||||
self.last_notified_token = self.current_token
|
self.last_notified_token = self.current_token
|
||||||
self.last_notified_ms = time_now_ms
|
self.last_notified_ms = time_now_ms
|
||||||
noify_deferred = self.notify_deferred
|
notify_deferred = self.notify_deferred
|
||||||
|
|
||||||
log_kv(
|
log_kv(
|
||||||
{
|
{
|
||||||
@ -153,7 +153,7 @@ class _NotifierUserStream:
|
|||||||
|
|
||||||
with PreserveLoggingContext():
|
with PreserveLoggingContext():
|
||||||
self.notify_deferred = ObservableDeferred(defer.Deferred())
|
self.notify_deferred = ObservableDeferred(defer.Deferred())
|
||||||
noify_deferred.callback(self.current_token)
|
notify_deferred.callback(self.current_token)
|
||||||
|
|
||||||
def remove(self, notifier: "Notifier") -> None:
|
def remove(self, notifier: "Notifier") -> None:
|
||||||
"""Remove this listener from all the indexes in the Notifier
|
"""Remove this listener from all the indexes in the Notifier
|
||||||
|
155
tests/rest/client/test_device_lists.py
Normal file
155
tests/rest/client/test_device_lists.py
Normal file
@ -0,0 +1,155 @@
|
|||||||
|
# Copyright 2022 The Matrix.org Foundation C.I.C.
|
||||||
|
#
|
||||||
|
# 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 synapse.rest import admin, devices, room, sync
|
||||||
|
from synapse.rest.client import account, login, register
|
||||||
|
|
||||||
|
from tests import unittest
|
||||||
|
|
||||||
|
|
||||||
|
class DeviceListsTestCase(unittest.HomeserverTestCase):
|
||||||
|
"""Tests regarding device list changes."""
|
||||||
|
|
||||||
|
servlets = [
|
||||||
|
admin.register_servlets_for_client_rest_resource,
|
||||||
|
login.register_servlets,
|
||||||
|
register.register_servlets,
|
||||||
|
account.register_servlets,
|
||||||
|
room.register_servlets,
|
||||||
|
sync.register_servlets,
|
||||||
|
devices.register_servlets,
|
||||||
|
]
|
||||||
|
|
||||||
|
def test_receiving_local_device_list_changes(self):
|
||||||
|
"""Tests that a local users that share a room receive each other's device list
|
||||||
|
changes.
|
||||||
|
"""
|
||||||
|
# Register two users
|
||||||
|
test_device_id = "TESTDEVICE"
|
||||||
|
alice_user_id = self.register_user("alice", "correcthorse")
|
||||||
|
alice_access_token = self.login(
|
||||||
|
alice_user_id, "correcthorse", device_id=test_device_id
|
||||||
|
)
|
||||||
|
|
||||||
|
bob_user_id = self.register_user("bob", "ponyponypony")
|
||||||
|
bob_access_token = self.login(bob_user_id, "ponyponypony")
|
||||||
|
|
||||||
|
# Create a room for them to coexist peacefully in
|
||||||
|
new_room_id = self.helper.create_room_as(
|
||||||
|
alice_user_id, is_public=True, tok=alice_access_token
|
||||||
|
)
|
||||||
|
self.assertIsNotNone(new_room_id)
|
||||||
|
|
||||||
|
# Have Bob join the room
|
||||||
|
self.helper.invite(
|
||||||
|
new_room_id, alice_user_id, bob_user_id, tok=alice_access_token
|
||||||
|
)
|
||||||
|
self.helper.join(new_room_id, bob_user_id, tok=bob_access_token)
|
||||||
|
|
||||||
|
# Now have Bob initiate an initial sync (in order to get a since token)
|
||||||
|
channel = self.make_request(
|
||||||
|
"GET",
|
||||||
|
"/sync",
|
||||||
|
access_token=bob_access_token,
|
||||||
|
)
|
||||||
|
self.assertEqual(channel.code, 200, channel.json_body)
|
||||||
|
next_batch_token = channel.json_body["next_batch"]
|
||||||
|
|
||||||
|
# ...and then an incremental sync. This should block until the sync stream is woken up,
|
||||||
|
# which we hope will happen as a result of Alice updating their device list.
|
||||||
|
bob_sync_channel = self.make_request(
|
||||||
|
"GET",
|
||||||
|
f"/sync?since={next_batch_token}&timeout=30000",
|
||||||
|
access_token=bob_access_token,
|
||||||
|
# Start the request, then continue on.
|
||||||
|
await_result=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Have alice update their device list
|
||||||
|
channel = self.make_request(
|
||||||
|
"PUT",
|
||||||
|
f"/devices/{test_device_id}",
|
||||||
|
{
|
||||||
|
"display_name": "New Device Name",
|
||||||
|
},
|
||||||
|
access_token=alice_access_token,
|
||||||
|
)
|
||||||
|
self.assertEqual(channel.code, 200, channel.json_body)
|
||||||
|
|
||||||
|
# Check that bob's incremental sync contains the updated device list.
|
||||||
|
# If not, the client would only receive the device list update on the
|
||||||
|
# *next* sync.
|
||||||
|
bob_sync_channel.await_result()
|
||||||
|
self.assertEqual(bob_sync_channel.code, 200, bob_sync_channel.json_body)
|
||||||
|
|
||||||
|
changed_device_lists = bob_sync_channel.json_body.get("device_lists", {}).get(
|
||||||
|
"changed", []
|
||||||
|
)
|
||||||
|
self.assertIn(alice_user_id, changed_device_lists, bob_sync_channel.json_body)
|
||||||
|
|
||||||
|
def test_not_receiving_local_device_list_changes(self):
|
||||||
|
"""Tests a local users DO NOT receive device updates from each other if they do not
|
||||||
|
share a room.
|
||||||
|
"""
|
||||||
|
# Register two users
|
||||||
|
test_device_id = "TESTDEVICE"
|
||||||
|
alice_user_id = self.register_user("alice", "correcthorse")
|
||||||
|
alice_access_token = self.login(
|
||||||
|
alice_user_id, "correcthorse", device_id=test_device_id
|
||||||
|
)
|
||||||
|
|
||||||
|
bob_user_id = self.register_user("bob", "ponyponypony")
|
||||||
|
bob_access_token = self.login(bob_user_id, "ponyponypony")
|
||||||
|
|
||||||
|
# These users do not share a room. They are lonely.
|
||||||
|
|
||||||
|
# Have Bob initiate an initial sync (in order to get a since token)
|
||||||
|
channel = self.make_request(
|
||||||
|
"GET",
|
||||||
|
"/sync",
|
||||||
|
access_token=bob_access_token,
|
||||||
|
)
|
||||||
|
self.assertEqual(channel.code, 200, channel.json_body)
|
||||||
|
next_batch_token = channel.json_body["next_batch"]
|
||||||
|
|
||||||
|
# ...and then an incremental sync. This should block until the sync stream is woken up,
|
||||||
|
# which we hope will happen as a result of Alice updating their device list.
|
||||||
|
bob_sync_channel = self.make_request(
|
||||||
|
"GET",
|
||||||
|
f"/sync?since={next_batch_token}&timeout=1000",
|
||||||
|
access_token=bob_access_token,
|
||||||
|
# Start the request, then continue on.
|
||||||
|
await_result=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Have alice update their device list
|
||||||
|
channel = self.make_request(
|
||||||
|
"PUT",
|
||||||
|
f"/devices/{test_device_id}",
|
||||||
|
{
|
||||||
|
"display_name": "New Device Name",
|
||||||
|
},
|
||||||
|
access_token=alice_access_token,
|
||||||
|
)
|
||||||
|
self.assertEqual(channel.code, 200, channel.json_body)
|
||||||
|
|
||||||
|
# Check that bob's incremental sync does not contain the updated device list.
|
||||||
|
bob_sync_channel.await_result()
|
||||||
|
self.assertEqual(bob_sync_channel.code, 200, bob_sync_channel.json_body)
|
||||||
|
|
||||||
|
changed_device_lists = bob_sync_channel.json_body.get("device_lists", {}).get(
|
||||||
|
"changed", []
|
||||||
|
)
|
||||||
|
self.assertNotIn(
|
||||||
|
alice_user_id, changed_device_lists, bob_sync_channel.json_body
|
||||||
|
)
|
@ -106,9 +106,13 @@ class RestHelper:
|
|||||||
default room version.
|
default room version.
|
||||||
tok: The access token to use in the request.
|
tok: The access token to use in the request.
|
||||||
expect_code: The expected HTTP response code.
|
expect_code: The expected HTTP response code.
|
||||||
|
extra_content: Extra keys to include in the body of the /createRoom request.
|
||||||
|
Note that if is_public is set, the "visibility" key will be overridden.
|
||||||
|
If room_version is set, the "room_version" key will be overridden.
|
||||||
|
custom_headers: HTTP headers to include in the request.
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
The ID of the newly created room.
|
The ID of the newly created room, or None if the request failed.
|
||||||
"""
|
"""
|
||||||
temp_id = self.auth_user_id
|
temp_id = self.auth_user_id
|
||||||
self.auth_user_id = room_creator
|
self.auth_user_id = room_creator
|
||||||
|
Loading…
Reference in New Issue
Block a user