From e968e1afdf3e857ac68ed07a9c680ab4d66fd0b8 Mon Sep 17 00:00:00 2001 From: Soyoung Kim Date: Wed, 8 Oct 2025 17:19:29 +0200 Subject: [PATCH 1/2] chore: fix clock util import path --- tests/base.py | 2 +- tests/server.py | 2 +- tests/test_createrooms_local.py | 2 +- tests/test_createrooms_remote.py | 2 +- tests/test_local_invites.py | 2 +- tests/test_local_joins.py | 2 +- tests/test_permissions.py | 2 +- tests/test_reactions.py | 2 +- tests/test_remote_invites.py | 2 +- tests/test_remote_joins.py | 2 +- tests/test_room_message_timestamp.py | 2 +- tests/test_room_versions.py | 2 +- tests/test_scheduled_tasks.py | 2 +- tests/test_tim_federation.py | 2 +- tests/test_tim_information.py | 2 +- tests/test_utils/fake_room_creation.py | 3 ++- tests/test_utils/oidc.py | 2 +- tests/unittest.py | 2 +- 18 files changed, 19 insertions(+), 18 deletions(-) diff --git a/tests/base.py b/tests/base.py index f1591c3..484b253 100644 --- a/tests/base.py +++ b/tests/base.py @@ -38,7 +38,7 @@ ) from synapse.server import HomeServer from synapse.types import UserID, create_requester -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.internet.testing import MemoryReactor from typing_extensions import override diff --git a/tests/server.py b/tests/server.py index 553f93e..c3771e5 100644 --- a/tests/server.py +++ b/tests/server.py @@ -42,7 +42,7 @@ from synapse.storage.database import LoggingDatabaseConnection, make_pool from synapse.storage.engines import BaseDatabaseEngine, create_engine from synapse.types import ISynapseReactor, JsonDict -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.enterprise import adbapi from twisted.internet import address, tcp, threads, udp from twisted.internet._resolver import SimpleResolverComplexifier diff --git a/tests/test_createrooms_local.py b/tests/test_createrooms_local.py index 4e1f924..b7b0e02 100644 --- a/tests/test_createrooms_local.py +++ b/tests/test_createrooms_local.py @@ -18,7 +18,7 @@ from parameterized import parameterized from synapse.api.constants import EventTypes, HistoryVisibility, JoinRules from synapse.server import HomeServer -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.internet.testing import MemoryReactor from tests.base import FederatingModuleApiTestCase diff --git a/tests/test_createrooms_remote.py b/tests/test_createrooms_remote.py index 420cd53..314d3b9 100644 --- a/tests/test_createrooms_remote.py +++ b/tests/test_createrooms_remote.py @@ -16,7 +16,7 @@ from parameterized import parameterized from synapse.server import HomeServer -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.internet.testing import MemoryReactor from tests.base import FederatingModuleApiTestCase diff --git a/tests/test_local_invites.py b/tests/test_local_invites.py index b4e5789..7e4591b 100644 --- a/tests/test_local_invites.py +++ b/tests/test_local_invites.py @@ -17,7 +17,7 @@ from parameterized import parameterized from synapse.server import HomeServer -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.internet.testing import MemoryReactor from synapse_invite_checker.types import PermissionConfig, PermissionDefaultSetting diff --git a/tests/test_local_joins.py b/tests/test_local_joins.py index 41dd66e..db21298 100644 --- a/tests/test_local_joins.py +++ b/tests/test_local_joins.py @@ -17,7 +17,7 @@ from typing import Any from synapse.server import HomeServer -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.internet.testing import MemoryReactor from tests.base import FederatingModuleApiTestCase diff --git a/tests/test_permissions.py b/tests/test_permissions.py index 6f0ac87..1a70ea8 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -20,7 +20,7 @@ from parameterized import parameterized_class from synapse.api.errors import Codes, HttpResponseException from synapse.server import HomeServer -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.internet.testing import MemoryReactor from synapse_invite_checker.types import ( diff --git a/tests/test_reactions.py b/tests/test_reactions.py index cb3c72b..ad9a102 100644 --- a/tests/test_reactions.py +++ b/tests/test_reactions.py @@ -19,7 +19,7 @@ from parameterized import parameterized_class from synapse.api.constants import EventTypes, RelationTypes from synapse.server import HomeServer -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.internet.testing import MemoryReactor from tests.base import FederatingModuleApiTestCase diff --git a/tests/test_remote_invites.py b/tests/test_remote_invites.py index 4cb1ad2..8fd2d57 100644 --- a/tests/test_remote_invites.py +++ b/tests/test_remote_invites.py @@ -19,7 +19,7 @@ from synapse.module_api import NOT_SPAM, errors from synapse.server import HomeServer from synapse.types import UserID -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.internet import defer from twisted.internet.testing import MemoryReactor diff --git a/tests/test_remote_joins.py b/tests/test_remote_joins.py index 08498df..a1b7a8a 100644 --- a/tests/test_remote_joins.py +++ b/tests/test_remote_joins.py @@ -18,7 +18,7 @@ from parameterized import parameterized from synapse.server import HomeServer -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.internet.testing import MemoryReactor from typing_extensions import override diff --git a/tests/test_room_message_timestamp.py b/tests/test_room_message_timestamp.py index cbeaea2..cab34e1 100644 --- a/tests/test_room_message_timestamp.py +++ b/tests/test_room_message_timestamp.py @@ -15,7 +15,7 @@ import logging from synapse.server import HomeServer -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.internet.testing import MemoryReactor from tests.base import FederatingModuleApiTestCase diff --git a/tests/test_room_versions.py b/tests/test_room_versions.py index 0845af5..196c565 100644 --- a/tests/test_room_versions.py +++ b/tests/test_room_versions.py @@ -16,7 +16,7 @@ from parameterized import parameterized from synapse.server import HomeServer -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.internet.testing import MemoryReactor from tests.base import FederatingModuleApiTestCase, construct_extra_content diff --git a/tests/test_scheduled_tasks.py b/tests/test_scheduled_tasks.py index 98f8389..1add8eb 100644 --- a/tests/test_scheduled_tasks.py +++ b/tests/test_scheduled_tasks.py @@ -23,7 +23,7 @@ from synapse.handlers.pagination import SHUTDOWN_AND_PURGE_ROOM_ACTION_NAME from synapse.server import HomeServer from synapse.types import TaskStatus, UserID -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.internet.testing import MemoryReactor from tests.base import FederatingModuleApiTestCase diff --git a/tests/test_tim_federation.py b/tests/test_tim_federation.py index a37b303..48ae8e7 100644 --- a/tests/test_tim_federation.py +++ b/tests/test_tim_federation.py @@ -15,7 +15,7 @@ from unittest.mock import AsyncMock, patch from synapse.server import HomeServer -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.internet.testing import MemoryReactor from synapse_invite_checker.types import FederationDomain diff --git a/tests/test_tim_information.py b/tests/test_tim_information.py index 5d14a4e..79a64cf 100644 --- a/tests/test_tim_information.py +++ b/tests/test_tim_information.py @@ -15,7 +15,7 @@ from http import HTTPStatus from synapse.server import HomeServer -from synapse.util import Clock +from synapse.util.clock import Clock from twisted.internet.testing import MemoryReactor import tests.unittest as synapse_test diff --git a/tests/test_utils/fake_room_creation.py b/tests/test_utils/fake_room_creation.py index aaf2f78..042ce0a 100644 --- a/tests/test_utils/fake_room_creation.py +++ b/tests/test_utils/fake_room_creation.py @@ -29,7 +29,8 @@ from synapse.events import EventBase, make_event_from_dict from synapse.federation.federation_client import SendJoinResult from synapse.types import RoomID -from synapse.util import Clock, stringutils +from synapse.util import stringutils +from synapse.util.clock import Clock class FakeRoom: diff --git a/tests/test_utils/oidc.py b/tests/test_utils/oidc.py index 9791823..630224f 100644 --- a/tests/test_utils/oidc.py +++ b/tests/test_utils/oidc.py @@ -21,7 +21,7 @@ import attr from synapse.server import HomeServer -from synapse.util import Clock +from synapse.util.clock import Clock from synapse.util.stringutils import random_string from twisted.web.http_headers import Headers diff --git a/tests/unittest.py b/tests/unittest.py index 52a1418..19a9510 100644 --- a/tests/unittest.py +++ b/tests/unittest.py @@ -50,7 +50,7 @@ from synapse.server import HomeServer from synapse.storage.keys import FetchKeyResult from synapse.types import JsonDict, Requester, UserID, create_requester -from synapse.util import Clock +from synapse.util.clock import Clock from synapse.util.httpresourcetree import create_resource_tree from twisted.internet.defer import Deferred, ensureDeferred from twisted.internet.testing import MemoryReactor, MemoryReactorClock From 9c6f75dcbda54c68d7240ed1321d33a39230effe Mon Sep 17 00:00:00 2001 From: Soyoung Kim Date: Wed, 8 Oct 2025 17:48:25 +0200 Subject: [PATCH 2/2] chore: use call_when_running instead of callWhenRunning --- synapse_invite_checker/invite_checker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse_invite_checker/invite_checker.py b/synapse_invite_checker/invite_checker.py index c1b1b30..ad1b9d6 100644 --- a/synapse_invite_checker/invite_checker.py +++ b/synapse_invite_checker/invite_checker.py @@ -270,7 +270,7 @@ def __init__(self, config: InviteCheckerConfig, api: ModuleApi): ).register(self.resource) self.api.register_web_resource(INFO_API_PREFIX, self.resource) - self.api._hs._reactor.callWhenRunning(self.after_startup) + self.api._clock.call_when_running(self.after_startup) logger.info("Module initialized at %s", BASE_API_PREFIX)