fix: update tests to work with breaking changes in recent synapse versions

tests/__init__.py

@@ -14,16 +14,16 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import base64
+import json
 import logging
 import time
-import json
 from typing import Any
 from unittest.mock import AsyncMock, Mock, patch
 from urllib.parse import parse_qs
 
-from jwcrypto import jwk, jwt, jwe
+from jwcrypto import jwe, jwk, jwt
 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
 

tests/server.py

@@ -45,7 +45,7 @@
 from synapse.storage.engines import create_engine
 from synapse.storage.prepare_database import prepare_database
 from synapse.types import ISynapseReactor
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet import address, tcp, threads, udp
 from twisted.internet.defer import Deferred
 from twisted.internet.interfaces import (
@@ -275,7 +275,7 @@ def runInteraction(
 
 def get_clock() -> tuple[ThreadedMemoryReactorClock, Clock]:
     clock = ThreadedMemoryReactorClock()
-    hs_clock = Clock(clock)
+    hs_clock = Clock(clock, "test")
     return clock, hs_clock
 
 
@@ -333,7 +333,10 @@ def setup_test_homeserver(
     if PREPPED_SQLITE_DB_CONN is None:
         temp_engine = create_engine(database_config)
         PREPPED_SQLITE_DB_CONN = LoggingDatabaseConnection(
-            sqlite3.connect(":memory:"), temp_engine, "PREPPED_CONN"
+            conn=sqlite3.connect(":memory:"),
+            engine=temp_engine,
+            default_txn_name="PREPPED_CONN",
+            server_name="test",
         )
 
         database = DatabaseConnectionConfig("master", database_config)
@@ -353,7 +356,6 @@ def setup_test_homeserver(
     hs = homeserver_to_use(
         name,
         config=config,
-        version_string="Synapse/tests",
         reactor=reactor,
     )
 

tests/unittest.py

@@ -42,7 +42,7 @@
 from synapse.rest import RegisterServletsFunc
 from synapse.server import HomeServer
 from synapse.types import JsonDict
-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
@@ -387,7 +387,9 @@ def setup_test_homeserver(
         kwargs["name"] = config_obj.server.server_name
 
         async def run_bg_updates() -> None:
-            with LoggingContext("run_bg_updates"):
+            with LoggingContext(
+                name="run_bg_updates", server_name=config_obj.server.server_name
+            ):
                 self.get_success(stor.db_pool.updates.run_background_updates(False))
 
         hs = setup_test_homeserver(**kwargs)