Skip to content

Commit a31d53b

Browse files
authored
Use twisted.internet.testing module in tests instead of deprecated twisted.test.proto_helpers. (#18728)
Follows: #18727 --------- Signed-off-by: Olivier 'reivilibre <oliverw@matrix.org>
1 parent 16a639e commit a31d53b

202 files changed

Lines changed: 202 additions & 201 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

changelog.d/18728.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Use `twisted.internet.testing` module in tests instead of deprecated `twisted.test.proto_helpers`.

tests/api/test_auth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import pymacaroons
2525

26-
from twisted.test.proto_helpers import MemoryReactor
26+
from twisted.internet.testing import MemoryReactor
2727

2828
from synapse.api.auth.internal import InternalAuth
2929
from synapse.api.auth_blocking import AuthBlocking

tests/api/test_filtering.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import jsonschema
2727

28-
from twisted.test.proto_helpers import MemoryReactor
28+
from twisted.internet.testing import MemoryReactor
2929

3030
from synapse.api.constants import EduTypes, EventContentFields
3131
from synapse.api.errors import SynapseError

tests/api/test_urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414

1515

16-
from twisted.test.proto_helpers import MemoryReactor
16+
from twisted.internet.testing import MemoryReactor
1717

1818
from synapse.api.urls import LoginSSORedirectURIBuilder
1919
from synapse.server import HomeServer

tests/app/test_openid_listener.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
from parameterized import parameterized
2424

25-
from twisted.test.proto_helpers import MemoryReactor
25+
from twisted.internet.testing import MemoryReactor
2626

2727
from synapse.app.generic_worker import GenericWorkerServer
2828
from synapse.app.homeserver import SynapseHomeServer

tests/appservice/test_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from typing import Any, List, Mapping, Optional, Sequence, Union
2222
from unittest.mock import Mock
2323

24-
from twisted.test.proto_helpers import MemoryReactor
24+
from twisted.internet.testing import MemoryReactor
2525

2626
from synapse.appservice import ApplicationService
2727
from synapse.server import HomeServer

tests/appservice/test_scheduler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from typing_extensions import TypeAlias
2525

2626
from twisted.internet import defer
27-
from twisted.test.proto_helpers import MemoryReactor
27+
from twisted.internet.testing import MemoryReactor
2828

2929
from synapse.appservice import (
3030
ApplicationService,

tests/config/test_room_directory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#
2020
import yaml
2121

22-
from twisted.test.proto_helpers import MemoryReactor
22+
from twisted.internet.testing import MemoryReactor
2323

2424
import synapse.rest.admin
2525
import synapse.rest.client.login

tests/crypto/test_keyring.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
from twisted.internet import defer
3333
from twisted.internet.defer import Deferred, ensureDeferred
34-
from twisted.test.proto_helpers import MemoryReactor
34+
from twisted.internet.testing import MemoryReactor
3535

3636
from synapse.api.errors import SynapseError
3737
from synapse.crypto import keyring

tests/events/test_auto_accept_invites.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import attr
2828
from parameterized import parameterized
2929

30-
from twisted.test.proto_helpers import MemoryReactor
30+
from twisted.internet.testing import MemoryReactor
3131

3232
from synapse.api.constants import EventTypes
3333
from synapse.api.errors import SynapseError

0 commit comments

Comments
 (0)