Refactor user directory tests

tests/handlers/test_user_directory.py

@@ -15,7 +15,6 @@
 from urllib.parse import quote
 
 from twisted.internet import defer
-from twisted.internet.testing import MemoryReactor
 
 import synapse.rest.admin
 from synapse.api.constants import UserTypes
@@ -28,6 +27,7 @@
 
 from tests import unittest
 from tests.storage.test_user_directory import GetUserDirectoryTables
+from tests.types import MemoryReactor
 from tests.unittest import override_config
 
 

tests/storage/test_user_directory.py

@@ -13,14 +13,13 @@
 # limitations under the License.
 from typing import Dict, List, Set, Tuple
 
-from twisted.internet.testing import MemoryReactor
-
 from synapse.rest import admin
 from synapse.rest.client import login, room
 from synapse.server import HomeServer
 from synapse.storage import DataStore
 from synapse.util import Clock
 
+from tests.types import MemoryReactor
 from tests.unittest import HomeserverTestCase, override_config
 
 ALICE = "@alice:a"

tests/test_terms_auth.py

@@ -15,12 +15,11 @@
 import json
 from unittest.mock import Mock
 
-from twisted.test.proto_helpers import MemoryReactorClock
-
 from synapse.rest.client.register import register_servlets
 from synapse.util import Clock
 
 from tests import unittest
+from tests.types import MemoryReactorClock
 
 
 class TermsTestCase(unittest.HomeserverTestCase):

tests/types.py

@@ -0,0 +1,9 @@
+try:
+    from twisted.internet.testing import MemoryReactor, MemoryReactorClock
+except ImportError:
+    # Twisted 19.7 moved stuff from twisted.test.proto_helpers to
+    # twisted.internet.testing. Let's do the import once rather than doing it
+    # in lots of different files.
+    from twisted.test.proto_helpers import MemoryReactor, MemoryReactorClock
+
+__all__ = ["MemoryReactor", "MemoryReactorClock"]

tests/unittest.py

@@ -26,7 +26,6 @@
 from canonicaljson import json
 
 from twisted.internet.defer import Deferred, ensureDeferred, succeed
-from twisted.internet.testing import MemoryReactor
 from twisted.python.failure import Failure
 from twisted.python.threadpool import ThreadPool
 from twisted.trial import unittest
@@ -54,6 +53,7 @@
 from tests.server import FakeChannel, get_clock, make_request, setup_test_homeserver
 from tests.test_utils import event_injection, setup_awaitable_errors
 from tests.test_utils.logging_setup import setup_logging
+from tests.types import MemoryReactor
 from tests.utils import default_config, setupdb
 
 setupdb()