Use mock from the stdlib. (#9772)

changelog.d/9772.misc

@@ -0,0 +1 @@
+Use mock from the standard library instead of a separate package.

setup.cfg

@@ -23,11 +23,10 @@ ignore=W503,W504,E203,E731,E501,B007
 
 [isort]
 line_length = 88
-sections=FUTURE,STDLIB,COMPAT,THIRDPARTY,TWISTED,FIRSTPARTY,TESTS,LOCALFOLDER
+sections=FUTURE,STDLIB,THIRDPARTY,TWISTED,FIRSTPARTY,TESTS,LOCALFOLDER
 default_section=THIRDPARTY
 known_first_party = synapse
 known_tests=tests
-known_compat = mock
 known_twisted=twisted,OpenSSL
 multi_line_output=3
 include_trailing_comma=true

setup.py

@@ -110,7 +110,7 @@ CONDITIONAL_REQUIREMENTS["mypy"] = ["mypy==0.812", "mypy-zope==0.2.13"]
 # Tests assume that all optional dependencies are installed.
 #
 # parameterized_class decorator was introduced in parameterized 0.7.0
-CONDITIONAL_REQUIREMENTS["test"] = ["mock>=2.0", "parameterized>=0.7.0"]
+CONDITIONAL_REQUIREMENTS["test"] = ["parameterized>=0.7.0"]
 
 setup(
     name="matrix-synapse",

synmark/suites/logging.py

@@ -16,8 +16,7 @@
 import logging
 import warnings
 from io import StringIO
-
+from unittest.mock import Mock
-from mock import Mock
 
 from pyperf import perf_counter
 

tests/api/test_auth.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 import pymacaroons
 

tests/app/test_openid_listener.py

@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from parameterized import parameterized
 

tests/appservice/test_appservice.py

@@ -13,8 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import re
-
+from unittest.mock import Mock
-from mock import Mock
 
 from twisted.internet import defer
 

tests/appservice/test_scheduler.py

@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from mock import Mock
+from unittest.mock import Mock
 
 from twisted.internet import defer
 

tests/crypto/test_keyring.py

@@ -13,8 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import time
-
+from unittest.mock import Mock
-from mock import Mock
 
 import attr
 import canonicaljson

tests/events/test_presence_router.py

@@ -13,8 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from typing import Dict, Iterable, List, Optional, Set, Tuple, Union
-
+from unittest.mock import Mock
-from mock import Mock
 
 import attr
 
@@ -314,7 +313,8 @@ class PresenceRouterTestCase(FederatingHomeserverTestCase):
             self.hs.get_federation_transport_client().send_transaction.call_args_list
         )
         for call in calls:
-            federation_transaction = call.args[0]  # type: Transaction
+            call_args = call[0]
+            federation_transaction = call_args[0]  # type: Transaction
 
             # Get the sent EDUs in this transaction
             edus = federation_transaction.get_dict()["edus"]

tests/federation/test_complexity.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 from synapse.api.errors import Codes, SynapseError
 from synapse.rest import admin

tests/federation/test_federation_catch_up.py

@@ -1,6 +1,5 @@
 from typing import List, Tuple
-
+from unittest.mock import Mock
-from mock import Mock
 
 from synapse.api.constants import EventTypes
 from synapse.events import EventBase

tests/federation/test_federation_sender.py

@@ -13,8 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from typing import Optional
-
+from unittest.mock import Mock
-from mock import Mock
 
 from signedjson import key, sign
 from signedjson.types import BaseKey, SigningKey

tests/handlers/test_admin.py

@@ -14,8 +14,7 @@
 # limitations under the License.
 
 from collections import Counter
-
+from unittest.mock import Mock
-from mock import Mock
 
 import synapse.api.errors
 import synapse.handlers.admin

tests/handlers/test_appservice.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 from twisted.internet import defer
 

tests/handlers/test_auth.py

@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from mock import Mock
+from unittest.mock import Mock
 
 import pymacaroons
 

tests/handlers/test_cas.py

@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-from mock import Mock
+from unittest.mock import Mock
 
 from synapse.handlers.cas_handler import CasResponse
 

tests/handlers/test_directory.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from mock import Mock
+from unittest.mock import Mock
 
 import synapse
 import synapse.api.errors

tests/handlers/test_e2e_keys.py

@@ -14,7 +14,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import mock
+from unittest import mock
 
 from signedjson import key as key, sign as sign
 

tests/handlers/test_e2e_room_keys.py

@@ -16,8 +16,7 @@
 # limitations under the License.
 
 import copy
-
+from unittest import mock
-import mock
 
 from synapse.api.errors import SynapseError
 

tests/handlers/test_oidc.py

@@ -14,10 +14,9 @@
 # limitations under the License.
 import json
 import os
+from unittest.mock import ANY, Mock, patch
 from urllib.parse import parse_qs, urlparse
 
-from mock import ANY, Mock, patch
-
 import pymacaroons
 
 from synapse.handlers.sso import MappingException

tests/handlers/test_password_providers.py

@@ -16,8 +16,7 @@
 """Tests for the password_auth_provider interface"""
 
 from typing import Any, Type, Union
-
+from unittest.mock import Mock
-from mock import Mock
 
 from twisted.internet import defer
 

tests/handlers/test_presence.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from mock import Mock, call
+from unittest.mock import Mock, call
 
 from signedjson.key import generate_signing_key
 

tests/handlers/test_profile.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 import synapse.types
 from synapse.api.errors import AuthError, SynapseError

tests/handlers/test_register.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 from synapse.api.auth import Auth
 from synapse.api.constants import UserTypes

tests/handlers/test_saml.py

@@ -13,8 +13,7 @@
 #  limitations under the License.
 
 from typing import Optional
-
+from unittest.mock import Mock
-from mock import Mock
 
 import attr
 

tests/handlers/test_typing.py

@@ -16,8 +16,7 @@
 
 import json
 from typing import Dict
-
+from unittest.mock import ANY, Mock, call
-from mock import ANY, Mock, call
 
 from twisted.internet import defer
 from twisted.web.resource import Resource

tests/handlers/test_user_directory.py

@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from mock import Mock
+from unittest.mock import Mock
 
 from twisted.internet import defer
 

tests/http/federation/test_matrix_federation_agent.py

@@ -14,8 +14,7 @@
 # limitations under the License.
 import logging
 from typing import Optional
-
+from unittest.mock import Mock
-from mock import Mock
 
 import treq
 from netaddr import IPSet

tests/http/federation/test_srv_resolver.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 from twisted.internet import defer
 from twisted.internet.defer import Deferred

tests/http/test_client.py

@@ -13,8 +13,7 @@
 #  limitations under the License.
 
 from io import BytesIO
-
+from unittest.mock import Mock
-from mock import Mock
 
 from netaddr import IPSet
 

tests/http/test_fedclient.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 from netaddr import IPSet
 from parameterized import parameterized

tests/http/test_servlet.py

@@ -14,8 +14,7 @@
 # limitations under the License.
 import json
 from io import BytesIO
-
+from unittest.mock import Mock
-from mock import Mock
 
 from synapse.api.errors import SynapseError
 from synapse.http.servlet import (

tests/http/test_simple_client.py

@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from mock import Mock
+from unittest.mock import Mock
 
 from netaddr import IPSet
 

tests/logging/test_terse_json.py

@@ -15,8 +15,7 @@
 import json
 import logging
 from io import BytesIO, StringIO
-
+from unittest.mock import Mock, patch
-from mock import Mock, patch
 
 from twisted.web.server import Request
 

tests/module_api/test_api.py

@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from mock import Mock
+from unittest.mock import Mock
 
 from synapse.api.constants import EduTypes
 from synapse.events import EventBase
@@ -358,7 +358,8 @@ class ModuleApiTestCase(FederatingHomeserverTestCase):
             self.hs.get_federation_transport_client().send_transaction.call_args_list
         )
         for call in calls:
-            federation_transaction = call.args[0]  # type: Transaction
+            call_args = call[0]
+            federation_transaction = call_args[0]  # type: Transaction
 
             # Get the sent EDUs in this transaction
             edus = federation_transaction.get_dict()["edus"]

tests/push/test_http.py

@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from mock import Mock
+from unittest.mock import Mock
 
 from twisted.internet.defer import Deferred
 

tests/replication/slave/storage/_base.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 from tests.replication._base import BaseStreamTestCase
 

tests/replication/tcp/streams/test_receipts.py

@@ -15,7 +15,7 @@
 
 # type: ignore
 
-from mock import Mock
+from unittest.mock import Mock
 
 from synapse.replication.tcp.streams._base import ReceiptsStream
 

tests/replication/tcp/streams/test_typing.py

@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from mock import Mock
+from unittest.mock import Mock
 
 from synapse.handlers.typing import RoomMember
 from synapse.replication.tcp.streams import TypingStream

tests/replication/test_federation_ack.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from synapse.app.generic_worker import GenericWorkerServer
 from synapse.replication.tcp.commands import FederationAckCommand

tests/replication/test_federation_sender_shard.py

@@ -13,8 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
-
+from unittest.mock import Mock
-from mock import Mock
 
 from synapse.api.constants import EventTypes, Membership
 from synapse.events.builder import EventBuilderFactory

tests/replication/test_pusher_shard.py

@@ -13,8 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
-
+from unittest.mock import Mock
-from mock import Mock
 
 from twisted.internet import defer
 

tests/replication/test_sharded_event_persister.py

@@ -13,8 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
-
+from unittest.mock import patch
-from mock import patch
 
 from synapse.api.room_versions import RoomVersion
 from synapse.rest import admin

tests/rest/admin/test_admin.py

@@ -17,8 +17,7 @@ import json
 import os
 import urllib.parse
 from binascii import unhexlify
-
+from unittest.mock import Mock
-from mock import Mock
 
 from twisted.internet.defer import Deferred
 

tests/rest/admin/test_room.py

@@ -16,8 +16,7 @@
 import json
 import urllib.parse
 from typing import List, Optional
-
+from unittest.mock import Mock
-from mock import Mock
 
 import synapse.rest.admin
 from synapse.api.constants import EventTypes, Membership

tests/rest/admin/test_user.py

@@ -19,8 +19,7 @@ import json
 import urllib.parse
 from binascii import unhexlify
 from typing import List, Optional
-
+from unittest.mock import Mock
-from mock import Mock
 
 import synapse.rest.admin
 from synapse.api.constants import UserTypes

tests/rest/client/test_retention.py

@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from mock import Mock
+from unittest.mock import Mock
 
 from synapse.api.constants import EventTypes
 from synapse.rest import admin

tests/rest/client/test_shadow_banned.py

@@ -12,7 +12,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 import synapse.rest.admin
 from synapse.api.constants import EventTypes

tests/rest/client/test_third_party_rules.py

@@ -14,8 +14,7 @@
 # limitations under the License.
 import threading
 from typing import Dict
-
+from unittest.mock import Mock
-from mock import Mock
 
 from synapse.events import EventBase
 from synapse.module_api import ModuleApi

tests/rest/client/test_transactions.py

@@ -1,4 +1,4 @@
-from mock import Mock, call
+from unittest.mock import Mock, call
 
 from twisted.internet import defer, reactor
 

tests/rest/client/v1/test_events.py

@@ -15,7 +15,7 @@
 
 """ Tests REST events for /events paths."""
 
-from mock import Mock
+from unittest.mock import Mock
 
 import synapse.rest.admin
 from synapse.rest.client.v1 import events, login, room

tests/rest/client/v1/test_login.py

@@ -16,10 +16,9 @@
 import time
 import urllib.parse
 from typing import Any, Dict, List, Optional, Union
+from unittest.mock import Mock
 from urllib.parse import urlencode
 
-from mock import Mock
-
 import pymacaroons
 
 from twisted.web.resource import Resource

tests/rest/client/v1/test_presence.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 from twisted.internet import defer
 

tests/rest/client/v1/test_rooms.py

@@ -20,10 +20,9 @@
 
 import json
 from typing import Iterable
+from unittest.mock import Mock
 from urllib import parse as urlparse
 
-from mock import Mock
-
 import synapse.rest.admin
 from synapse.api.constants import EventContentFields, EventTypes, Membership
 from synapse.handlers.pagination import PurgeStatus

tests/rest/client/v1/test_typing.py

@@ -16,7 +16,7 @@
 
 """Tests REST events for /rooms paths."""
 
-from mock import Mock
+from unittest.mock import Mock
 
 from synapse.rest.client.v1 import room
 from synapse.types import UserID

tests/rest/client/v1/utils.py

@@ -21,8 +21,7 @@ import re
 import time
 import urllib.parse
 from typing import Any, Dict, Mapping, MutableMapping, Optional
-
+from unittest.mock import patch
-from mock import patch
 
 import attr
 

tests/rest/key/v2/test_remote_key_resource.py

@@ -14,8 +14,7 @@
 # limitations under the License.
 import urllib.parse
 from io import BytesIO, StringIO
-
+from unittest.mock import Mock
-from mock import Mock
 
 import signedjson.key
 from canonicaljson import encode_canonical_json

tests/rest/media/v1/test_media_storage.py

@@ -18,10 +18,9 @@ import tempfile
 from binascii import unhexlify
 from io import BytesIO
 from typing import Optional
+from unittest.mock import Mock
 from urllib import parse
 
-from mock import Mock
-
 import attr
 from parameterized import parameterized_class
 from PIL import Image as Image

tests/rest/media/v1/test_url_preview.py

@@ -15,8 +15,7 @@
 import json
 import os
 import re
-
+from unittest.mock import patch
-from mock import patch
 
 from twisted.internet._resolver import HostResolution
 from twisted.internet.address import IPv4Address, IPv6Address

tests/scripts/test_new_matrix_user.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 from synapse._scripts.register_new_matrix_user import request_registration
 

tests/server_notices/test_resource_limits_server_notices.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 from twisted.internet import defer
 

tests/storage/test_appservice.py

@@ -15,8 +15,7 @@
 import json
 import os
 import tempfile
-
+from unittest.mock import Mock
-from mock import Mock
 
 import yaml
 

tests/storage/test_background_update.py

@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 
 from synapse.storage.background_updates import BackgroundUpdater
 

tests/storage/test_base.py

@@ -15,8 +15,7 @@
 
 
 from collections import OrderedDict
-
+from unittest.mock import Mock
-from mock import Mock
 
 from twisted.internet import defer
 

tests/storage/test_cleanup_extrems.py

@@ -14,9 +14,7 @@
 # limitations under the License.
 
 import os.path
-from unittest.mock import patch
+from unittest.mock import Mock, patch
-
-from mock import Mock
 
 import synapse.rest.admin
 from synapse.api.constants import EventTypes

tests/storage/test_client_ips.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 import synapse.rest.admin
 from synapse.http.site import XForwardedForRequest

tests/storage/test_event_push_actions.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 from tests.unittest import HomeserverTestCase
 

tests/storage/test_monthly_active_users.py

@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from mock import Mock
+from unittest.mock import Mock
 
 from twisted.internet import defer
 

tests/test_distributor.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from synapse.util.distributor import Distributor
 

tests/test_federation.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 from twisted.internet.defer import succeed
 

tests/test_phone_home.py

@@ -14,8 +14,7 @@
 # limitations under the License.
 
 import resource
-
+from unittest import mock
-import mock
 
 from synapse.app.phone_stats_home import phone_stats_home
 

tests/test_state.py

@@ -13,8 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from typing import List, Optional
-
+from unittest.mock import Mock
-from mock import Mock
 
 from twisted.internet import defer
 

tests/test_terms_auth.py

@@ -13,8 +13,7 @@
 # limitations under the License.
 
 import json
-
+from unittest.mock import Mock
-from mock import Mock
 
 from twisted.test.proto_helpers import MemoryReactorClock
 

tests/test_utils/__init__.py

@@ -21,8 +21,7 @@ import sys
 import warnings
 from asyncio import Future
 from typing import Any, Awaitable, Callable, TypeVar
-
+from unittest.mock import Mock
-from mock import Mock
 
 import attr
 

tests/test_visibility.py

@@ -14,8 +14,7 @@
 # limitations under the License.
 import logging
 from typing import Optional
-
+from unittest.mock import Mock
-from mock import Mock
 
 from twisted.internet import defer
 from twisted.internet.defer import succeed

tests/unittest.py

@@ -21,8 +21,7 @@ import inspect
 import logging
 import time
 from typing import Callable, Dict, Iterable, Optional, Tuple, Type, TypeVar, Union
-
+from unittest.mock import Mock, patch
-from mock import Mock, patch
 
 from canonicaljson import json
 

tests/util/caches/test_descriptors.py

@@ -15,8 +15,7 @@
 # limitations under the License.
 import logging
 from typing import Set
-
+from unittest import mock
-import mock
 
 from twisted.internet import defer, reactor
 

tests/util/caches/test_ttlcache.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 
 from synapse.util.caches.ttlcache import TTLCache
 

tests/util/test_file_consumer.py

@@ -16,8 +16,7 @@
 
 import threading
 from io import StringIO
-
+from unittest.mock import NonCallableMock
-from mock import NonCallableMock
 
 from twisted.internet import defer, reactor
 

tests/util/test_lrucache.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from mock import Mock
+from unittest.mock import Mock
 
 from synapse.util.caches.lrucache import LruCache
 from synapse.util.caches.treecache import TreeCache

tests/utils.py

@@ -21,10 +21,9 @@ import time
 import uuid
 import warnings
 from typing import Type
+from unittest.mock import Mock, patch
 from urllib import parse as urlparse
 
-from mock import Mock, patch
-
 from twisted.internet import defer
 
 from synapse.api.constants import EventTypes