diff options
| author | Eric Eastwood <eric.eastwood@beta.gouv.fr> | 2024-05-16 11:54:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-16 11:54:46 -0500 |
| commit | 28a948f04f1e04cbcbd68c53a78aa2ada3a791a1 (patch) | |
| tree | 6eca39530211b38b03e803ed8c84039b9d7fcaa1 /tests/events | |
| parent | Route `/make_knock` and `/send_knock` to workers in Complement docker image (... (diff) | |
| download | synapse-28a948f04f1e04cbcbd68c53a78aa2ada3a791a1.tar.xz | |
Removed `request_key` from the `SyncConfig` (moved outside as its own function parameter) (#17201)
Removed `request_key` from the `SyncConfig` (moved outside as its own function parameter) so it doesn't have to flow into `_generate_sync_entry_for_xxx` methods. This way we can separate the concerns of caching from generating the response and reuse the `_generate_sync_entry_for_xxx` functions as we see fit. Plus caching doesn't really have anything to do with the config of sync. Split from https://github.com/element-hq/synapse/pull/17167 Spawning from https://github.com/element-hq/synapse/pull/17167#discussion_r1601497279
Diffstat (limited to 'tests/events')
| -rw-r--r-- | tests/events/test_presence_router.py | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/tests/events/test_presence_router.py b/tests/events/test_presence_router.py index aa67afa695..e48983ddfe 100644 --- a/tests/events/test_presence_router.py +++ b/tests/events/test_presence_router.py @@ -36,7 +36,7 @@ from synapse.server import HomeServer from synapse.types import JsonDict, StreamToken, create_requester from synapse.util import Clock -from tests.handlers.test_sync import SyncVersion, generate_sync_config +from tests.handlers.test_sync import SyncRequestKey, SyncVersion, generate_sync_config from tests.unittest import ( FederatingHomeserverTestCase, HomeserverTestCase, @@ -498,6 +498,15 @@ def send_presence_update( return channel.json_body +_request_key = 0 + + +def generate_request_key() -> SyncRequestKey: + global _request_key + _request_key += 1 + return ("request_key", _request_key) + + def sync_presence( testcase: HomeserverTestCase, user_id: str, @@ -521,7 +530,11 @@ def sync_presence( sync_config = generate_sync_config(requester.user.to_string()) sync_result = testcase.get_success( testcase.hs.get_sync_handler().wait_for_sync_for_user( - requester, sync_config, SyncVersion.SYNC_V2, since_token + requester, + sync_config, + SyncVersion.SYNC_V2, + generate_request_key(), + since_token, ) ) |