Merge "Remove dependency on mock"

test-requirements.txt

@@ -8,7 +8,6 @@ coverage>=5.2.1 # Apache-2.0
 pytest>=4.6.11  # MIT
 pytest-cov>=2.12.1  # MIT
 stestr>=2.0.0 # Apache-2.0
-mock>=3.0 # BSD
 python-swiftclient>=3.2.0
 python-keystoneclient>=3.19.0 # Apache-2.0
 boto>=2.32.1

test/debug_logger.py

@@ -15,7 +15,7 @@
 import collections
 import contextlib
 import logging
-import mock
+from unittest import mock
 import sys
 
 from collections import defaultdict

test/functional/__init__.py

@@ -17,7 +17,7 @@
 import configparser
 import contextlib
 
-import mock
+from unittest import mock
 import os
 from urllib.parse import urlparse, urlsplit, urlunsplit
 import sys

test/functional/tests.py

@@ -31,7 +31,7 @@ from email.utils import parsedate
 
 from email.parser import BytesFeedParser as FeedParser
 
-import mock
+from unittest import mock
 
 from test.functional import load_constraint, cluster_info
 from test.functional import check_response, retry

test/probe/common.py

@@ -17,7 +17,7 @@
 import errno
 import gc
 import json
-import mock
+from unittest import mock
 import os
 from subprocess import Popen, PIPE
 import sys

test/probe/test_mpu.py

@@ -28,7 +28,7 @@ from test.probe.common import ReplProbeTest, ENABLED_POLICIES
 from boto3.s3.transfer import TransferConfig
 from test.s3api import get_s3_client
 
-import mock
+from unittest import mock
 
 
 class TestMixedPolicyMPU(ReplProbeTest):

test/probe/test_object_async_update.py

@@ -25,7 +25,7 @@ from unittest import main, SkipTest
 from uuid import uuid4
 import random
 
-import mock
+from unittest import mock
 
 from swiftclient import client
 from swiftclient.exceptions import ClientException

test/probe/test_sharder.py

@@ -44,7 +44,7 @@ from test.probe import PROXY_BASE_URL
 from test.probe.brain import BrainSplitter
 from test.probe.common import ReplProbeTest, get_server_number, \
     wait_for_server_to_hangup, ENABLED_POLICIES, exclude_nodes
-import mock
+from unittest import mock
 
 try:
     from swiftclient.requests_compat import requests as client_requests

test/unit/__init__.py

@@ -55,7 +55,7 @@ from swift.obj import server
 
 import functools
 from gzip import GzipFile
-import mock as mocklib
+from unittest import mock as mocklib
 import inspect
 from unittest import SkipTest
 

test/unit/account/test_backend.py

@@ -25,7 +25,7 @@ import sqlite3
 import itertools
 from contextlib import contextmanager
 import random
-import mock
+from unittest import mock
 import base64
 import shutil
 

test/unit/account/test_reaper.py

@@ -20,7 +20,7 @@ import shutil
 import tempfile
 import unittest
 
-from mock import patch, call, DEFAULT
+from unittest.mock import patch, call, DEFAULT
 import eventlet
 
 from swift.account import reaper

test/unit/account/test_server.py

@@ -15,7 +15,7 @@
 
 import errno
 import os
-import mock
+from unittest import mock
 import posix
 import unittest
 from tempfile import mkdtemp

test/unit/account/test_utils.py

@@ -16,7 +16,7 @@ import time
 import unittest
 import json
 
-import mock
+from unittest import mock
 
 from swift.account import utils, backend
 from swift.common.storage_policy import POLICIES, StoragePolicy

test/unit/cli/test_container_deleter.py

@@ -13,7 +13,7 @@
 import collections
 import itertools
 import json
-import mock
+from unittest import mock
 import unittest
 
 from swift.cli import container_deleter

test/unit/cli/test_form_signature.py

@@ -17,7 +17,7 @@
 import io
 import hashlib
 import hmac
-import mock
+from unittest import mock
 import unittest
 
 from swift.cli import form_signature

test/unit/cli/test_info.py

@@ -15,7 +15,7 @@
 from argparse import Namespace
 import os
 import unittest
-import mock
+from unittest import mock
 from shutil import rmtree
 from tempfile import mkdtemp
 

test/unit/cli/test_manage_shard_ranges.py

@@ -17,7 +17,7 @@ import unittest
 from argparse import Namespace
 from textwrap import dedent
 
-import mock
+from unittest import mock
 from shutil import rmtree
 from tempfile import mkdtemp
 

test/unit/cli/test_recon.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import json
-import mock
+from unittest import mock
 import os
 import random
 import re

test/unit/cli/test_recon_cron.py

@@ -16,7 +16,7 @@
 import tempfile
 import shutil
 import os
-import mock
+from unittest import mock
 
 from unittest import TestCase
 from swift.cli.recon_cron import get_async_count

test/unit/cli/test_relinker.py

@@ -18,7 +18,7 @@ from contextlib import contextmanager
 import logging
 from textwrap import dedent
 
-import mock
+from unittest import mock
 import os
 import pickle
 import shutil

test/unit/cli/test_reload.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
 import signal
 import socket
 import subprocess

test/unit/cli/test_ring_builder_analyzer.py

@@ -16,7 +16,7 @@
 
 import os
 import json
-import mock
+from unittest import mock
 from io import StringIO
 import unittest
 from test.unit import with_tempdir

test/unit/cli/test_ringbuilder.py

@@ -16,7 +16,7 @@
 import errno
 import itertools
 import logging
-import mock
+from unittest import mock
 import os
 import re
 import io

test/unit/cli/test_ringcomposer.py

@@ -18,7 +18,7 @@ import shutil
 import tempfile
 import unittest
 
-from mock import mock
+from unittest import mock
 
 from swift.cli import ringcomposer
 from test.unit import write_stub_builder

test/unit/common/middleware/crypto/test_crypto.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import unittest
-import mock
+from unittest import mock
 
 from swift.common import registry
 from swift.common.middleware import crypto

test/unit/common/middleware/crypto/test_crypto_utils.py

@@ -15,7 +15,7 @@
 import os
 import unittest
 
-import mock
+from unittest import mock
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 

test/unit/common/middleware/crypto/test_decrypter.py

@@ -17,7 +17,7 @@ import json
 import os
 import unittest
 
-import mock
+from unittest import mock
 
 from swift.common.request_helpers import is_object_transient_sysmeta
 from swift.common.utils import MD5_OF_EMPTY_STRING

test/unit/common/middleware/crypto/test_encrypter.py

@@ -19,7 +19,7 @@ import json
 import os
 import unittest
 
-import mock
+from unittest import mock
 
 import urllib.parse
 from swift.common.middleware.crypto import encrypter

test/unit/common/middleware/crypto/test_keymaster.py

@@ -19,7 +19,7 @@ import hmac
 
 import os
 
-import mock
+from unittest import mock
 import unittest
 
 from getpass import getuser

test/unit/common/middleware/crypto/test_kmip_keymaster.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 import logging
-import mock
+from unittest import mock
 import os
 import unittest
 from tempfile import mkdtemp

test/unit/common/middleware/crypto/test_kms_keymaster.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import base64
-import mock
+from unittest import mock
 import unittest
 import sys
 sys.modules['castellan'] = mock.Mock()

test/unit/common/middleware/s3api/__init__.py

@@ -16,7 +16,7 @@ import json
 import unittest
 from datetime import datetime
 import email
-import mock
+from unittest import mock
 import time
 from contextlib import contextmanager
 

test/unit/common/middleware/s3api/test_acl.py

@@ -15,7 +15,7 @@
 
 import base64
 import unittest
-import mock
+from unittest import mock
 
 from io import BytesIO
 

test/unit/common/middleware/s3api/test_bucket.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import unittest
-import mock
+from unittest import mock
 from hashlib import sha256
 
 from urllib.parse import quote, parse_qsl

test/unit/common/middleware/s3api/test_multi_delete.py

@@ -19,7 +19,7 @@ import hashlib
 import json
 import unittest
 from datetime import datetime
-import mock
+from unittest import mock
 
 from swift.common import swob
 from swift.common.swob import Request

test/unit/common/middleware/s3api/test_multi_get.py

@@ -16,7 +16,7 @@
 import binascii
 import string
 import json
-import mock
+from unittest import mock
 
 from swift.common import swob, utils
 from swift.common.request_helpers import get_reserved_name

test/unit/common/middleware/s3api/test_multi_upload.py

@@ -16,7 +16,7 @@
 import base64
 import binascii
 import hashlib
-from mock import patch
+from unittest.mock import patch
 import os
 import time
 import unittest

test/unit/common/middleware/s3api/test_obj.py

@@ -21,7 +21,7 @@ from hashlib import sha256
 import os
 from os.path import join
 import time
-from mock import patch
+from unittest.mock import patch
 import json
 
 from swift.common import swob

test/unit/common/middleware/s3api/test_s3api.py

@@ -16,10 +16,10 @@
 
 import base64
 import unittest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import calendar
 from datetime import datetime
-import mock
+from unittest import mock
 import requests
 import json
 from paste.deploy import loadwsgi

test/unit/common/middleware/s3api/test_s3request.py

@@ -15,7 +15,7 @@
 
 from datetime import timedelta
 import hashlib
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import unittest
 
 from io import BytesIO

test/unit/common/middleware/s3api/test_s3token.py

@@ -19,7 +19,7 @@ import time
 import unittest
 import uuid
 
-import mock
+from unittest import mock
 import requests
 from requests_mock.contrib import fixture as rm_fixture
 import urllib.parse

test/unit/common/middleware/s3api/test_versioning.py

@@ -15,7 +15,7 @@
 
 import unittest
 
-from mock import patch
+from unittest.mock import patch
 
 from swift.common.swob import Request, HTTPNoContent
 from swift.common.middleware.s3api.etree import fromstring, tostring, \

test/unit/common/middleware/test_backend_ratelimit.py

@@ -22,7 +22,7 @@ import unittest
 from collections import defaultdict
 from tempfile import mkdtemp
 
-import mock
+from unittest import mock
 
 from swift.common.middleware import backend_ratelimit
 from swift.common.middleware.backend_ratelimit import \

test/unit/common/middleware/test_bulk.py

@@ -20,12 +20,12 @@ import unittest
 import os
 import tarfile
 import zlib
-import mock
+from unittest import mock
 from io import BytesIO
 from shutil import rmtree
 from tempfile import mkdtemp
 from eventlet import sleep
-from mock import patch, call
+from unittest.mock import patch, call
 from test.debug_logger import debug_logger
 from test.unit.common.middleware.helpers import FakeSwift
 from swift.common import utils, constraints, registry

test/unit/common/middleware/test_cname_lookup.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import unittest
-import mock
+from unittest import mock
 
 try:
     # this test requires the dnspython package to be installed
@@ -177,7 +177,8 @@ class TestCNAMELookup(unittest.TestCase):
                 self.cache[key] = value
 
         module = 'swift.common.middleware.cname_lookup.lookup_cname'
-        dns_module = 'dns.resolver.Resolver.query'
+        dns_module = 'swift.common.middleware.cname_lookup.' \
+            'dns.resolver.Resolver.query'
         memcache = memcache_stub()
 
         with mock.patch(module) as m:
@@ -305,25 +306,26 @@ class TestCNAMELookup(unittest.TestCase):
         resp = do_test('c.badtest.com')
         self.assertEqual(resp, bad_domain)
 
-    @mock.patch('dns.resolver.Resolver.query',
-                side_effect=dns.exception.DNSException)
-    def test_host_is_storage_domain(self, mock_lookup):
+    def test_host_is_storage_domain(self):
         conf = {'storage_domain': 'storage.example.com',
                 'lookup_depth': 2}
         app = cname_lookup.CNAMELookupMiddleware(FakeApp(), conf)
 
         def do_test(host):
-            req = Request.blank('/', environ={'REQUEST_METHOD': 'GET'},
-                                headers={'Host': host})
-            return app(req.environ, start_response)
+            with mock.patch.object(
+                app.resolver, 'query',
+                side_effect=dns.exception.DNSException,
+            ) as mock_lookup:
+                req = Request.blank('/', environ={'REQUEST_METHOD': 'GET'},
+                                    headers={'Host': host})
+                return app(req.environ, start_response), mock_lookup
 
         bad_domain = [b'CNAME lookup failed to resolve to a valid domain']
-        resp = do_test('c.badtest.com')
+        resp, mock_lookup = do_test('c.badtest.com')
         self.assertEqual(resp, bad_domain)
         self.assertEqual(1, len(mock_lookup.mock_calls))
-        mock_lookup.reset_mock()
 
-        resp = do_test('storage.example.com')
+        resp, mock_lookup = do_test('storage.example.com')
         self.assertEqual(resp, [b'FAKE APP'])
         self.assertEqual(0, len(mock_lookup.mock_calls))
 
@@ -365,7 +367,8 @@ class TestCNAMELookup(unittest.TestCase):
                 self.nameserver_ports = None
 
         mocked_resolver = MockedResolver()
-        dns_module = 'dns.resolver.Resolver'
+        dns_module = 'swift.common.middleware.cname_lookup.' \
+            'dns.resolver.Resolver'
 
         # If no nameservers provided in conf, resolver nameservers is unset
         for conf in [{}, {'nameservers': ''}]:

test/unit/common/middleware/test_container_sync.py

@@ -19,7 +19,7 @@ import shutil
 import tempfile
 import unittest
 import uuid
-import mock
+from unittest import mock
 
 from swift.common import swob
 from swift.common.middleware import container_sync

test/unit/common/middleware/test_copy.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 import unittest
 import urllib.parse
 

test/unit/common/middleware/test_dlo.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 import json
-import mock
+from unittest import mock
 import shutil
 import tempfile
 from textwrap import dedent

test/unit/common/middleware/test_etag_quoter.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
 import unittest
 
 from swift.common import swob

test/unit/common/middleware/test_list_endpoints.py

@@ -20,7 +20,7 @@ from tempfile import mkdtemp
 from shutil import rmtree
 
 import os
-import mock
+from unittest import mock
 from swift.common import ring, utils
 from swift.common.utils import split_path
 from swift.common.swob import Request, Response

test/unit/common/middleware/test_memcache.py

@@ -18,7 +18,7 @@ from textwrap import dedent
 import unittest
 
 from eventlet.green import ssl
-import mock
+from unittest import mock
 
 from swift.common.middleware import memcache
 from swift.common.memcached import MemcacheRing

test/unit/common/middleware/test_object_versioning.py

@@ -17,7 +17,7 @@ import functools
 import json
 import os
 import time
-import mock
+from unittest import mock
 import unittest
 import urllib.parse
 from swift.common import swob, utils

test/unit/common/middleware/test_proxy_logging.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 import logging
 
-import mock
+from unittest import mock
 import time
 import unittest
 from io import BytesIO

test/unit/common/middleware/test_ratelimit.py

@@ -16,7 +16,7 @@
 import unittest
 import time
 import eventlet
-import mock
+from unittest import mock
 
 from test.debug_logger import debug_logger
 from test.unit import FakeMemcache

test/unit/common/middleware/test_read_only.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
 import unittest
 
 from swift.common.middleware import read_only

test/unit/common/middleware/test_recon.py

@@ -17,7 +17,7 @@ import array
 from contextlib import contextmanager
 import errno
 import json
-import mock
+from unittest import mock
 import os
 from posix import stat_result, statvfs_result
 from shutil import rmtree

test/unit/common/middleware/test_staticweb.py

@@ -15,7 +15,7 @@
 
 import json
 import unittest
-import mock
+from unittest import mock
 
 from urllib.parse import urlparse
 

test/unit/common/middleware/test_symlink.py

@@ -17,7 +17,7 @@
 import unittest
 import io
 import json
-import mock
+from unittest import mock
 
 from urllib.parse import parse_qs
 from swift.common import swob

test/unit/common/middleware/test_tempurl.py

@@ -31,7 +31,7 @@
 import base64
 import hmac
 import itertools
-import mock
+from unittest import mock
 import unittest
 import hashlib
 from urllib.parse import quote

test/unit/common/middleware/test_versioned_writes.py

@@ -17,7 +17,7 @@ import functools
 import json
 import os
 import time
-import mock
+from unittest import mock
 import unittest
 from swift.common import swob, utils, registry
 from swift.common.middleware import versioned_writes, copy

test/unit/common/ring/test_builder.py

@@ -15,7 +15,7 @@
 
 import copy
 import errno
-import mock
+from unittest import mock
 import operator
 import os
 import unittest

test/unit/common/ring/test_composite_builder.py

@@ -15,7 +15,7 @@
 import json
 from contextlib import contextmanager
 
-import mock
+from unittest import mock
 import os
 import random
 import tempfile

test/unit/common/ring/test_ring.py

@@ -26,7 +26,7 @@ from shutil import rmtree
 from time import sleep, time
 import sys
 import copy
-import mock
+from unittest import mock
 
 from swift.common import ring, utils
 from swift.common.ring import utils as ring_utils

test/unit/common/test_bufferedhttp.py

@@ -16,7 +16,7 @@
 import io
 from http.client import parse_headers
 
-import mock
+from unittest import mock
 import unittest
 import socket
 

test/unit/common/test_constraints.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import unittest
-import mock
+from unittest import mock
 import tempfile
 import time
 

test/unit/common/test_container_sync_realms.py

@@ -18,7 +18,7 @@ import os
 import unittest
 import uuid
 
-from mock import ANY, patch
+from unittest.mock import ANY, patch
 from swift.common.container_sync_realms import ContainerSyncRealms
 from test.debug_logger import debug_logger
 from test.unit import temptree

test/unit/common/test_daemon.py

@@ -21,7 +21,7 @@ import unittest
 from getpass import getuser
 import logging
 from test.unit import tmpfile, with_tempdir
-import mock
+from unittest import mock
 import signal
 from contextlib import contextmanager
 import itertools

test/unit/common/test_db.py

@@ -21,7 +21,7 @@ from tempfile import mkdtemp
 from shutil import rmtree, copy
 from uuid import uuid4
 import pickle
-import mock
+from unittest import mock
 
 import base64
 import json
@@ -29,7 +29,7 @@ import sqlite3
 import itertools
 import time
 import random
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 from eventlet.timeout import Timeout
 

test/unit/common/test_db_auditor.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import unittest
-import mock
+from unittest import mock
 import time
 import os
 import random

test/unit/common/test_db_replicator.py

@@ -26,8 +26,8 @@ from shutil import rmtree, copy
 from tempfile import mkdtemp, NamedTemporaryFile
 import json
 
-import mock
-from mock import patch, call
+from unittest import mock
+from unittest.mock import patch, call
 from importlib import reload as reload_module
 
 from swift.container.backend import DATADIR

test/unit/common/test_direct_client.py

@@ -21,7 +21,7 @@ from contextlib import contextmanager
 import time
 import pickle
 
-import mock
+from unittest import mock
 import urllib.parse
 
 from swift.common import direct_client

test/unit/common/test_error_limiter.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import unittest
-import mock
+from unittest import mock
 from time import time
 
 from swift.common.error_limiter import ErrorLimiter

test/unit/common/test_http_protocol.py

@@ -16,7 +16,7 @@
 from argparse import Namespace
 from io import BytesIO
 import json
-import mock
+from unittest import mock
 import types
 import unittest
 import eventlet.wsgi as wsgi

test/unit/common/test_internal_client.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import json
-import mock
+from unittest import mock
 import unittest
 import zlib
 import os

test/unit/common/test_linkat.py

@@ -18,7 +18,7 @@
 import ctypes
 import unittest
 import os
-import mock
+from unittest import mock
 from uuid import uuid4
 from tempfile import gettempdir
 

test/unit/common/test_manager.py

@@ -16,7 +16,7 @@
 import unittest
 from test.unit import temptree
 
-import mock
+from unittest import mock
 import os
 import sys
 import resource

test/unit/common/test_memcached.py

@@ -25,7 +25,7 @@ import time
 import unittest
 import os
 
-import mock
+from unittest import mock
 from configparser import NoSectionError, NoOptionError
 
 from eventlet import GreenPool, sleep, Queue
@@ -36,7 +36,7 @@ from swift.common import memcached
 from swift.common.memcached import MemcacheConnectionError, md5hash, \
     MemcacheCommand, EXPTIME_MAXDELTA
 from swift.common.utils import md5, human_readable
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 from test.debug_logger import debug_logger
 
 

test/unit/common/test_registry.py

@@ -15,7 +15,7 @@
 
 from swift.common import registry, utils
 
-import mock
+from unittest import mock
 import unittest
 
 

test/unit/common/test_splice.py

@@ -24,7 +24,7 @@ import unittest
 import contextlib
 import re
 
-import mock
+from unittest import mock
 
 from swift.common.splice import splice, tee
 

test/unit/common/test_statsd_client.py

@@ -22,7 +22,7 @@ import time
 import unittest
 import warnings
 
-import mock
+from unittest import mock
 from queue import Queue, Empty
 
 

test/unit/common/test_storage_policy.py

@@ -18,7 +18,7 @@ import io
 import logging
 import unittest
 import os
-import mock
+from unittest import mock
 from functools import partial
 
 from tempfile import NamedTemporaryFile

test/unit/common/test_swob.py

@@ -23,7 +23,7 @@ import time
 from io import BytesIO
 
 from urllib.parse import quote
-import mock
+from unittest import mock
 
 import swift.common.swob as swob
 from swift.common import utils, exceptions

test/unit/common/test_utils.py

@@ -34,7 +34,7 @@ import eventlet.patcher
 import grp
 import logging
 import os
-import mock
+from unittest import mock
 import posix
 import pwd
 import random
@@ -57,7 +57,7 @@ from io import BytesIO, StringIO
 from shutil import rmtree
 from functools import partial
 from tempfile import TemporaryFile, NamedTemporaryFile, mkdtemp
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 from configparser import NoSectionError, NoOptionError
 from uuid import uuid4
 

test/unit/common/test_wsgi.py

@@ -32,7 +32,7 @@ from textwrap import dedent
 
 from urllib.parse import quote
 
-import mock
+from unittest import mock
 
 import swift.common.middleware.catch_errors
 import swift.common.middleware.gatekeeper

test/unit/common/utils/test_config.py

@@ -19,7 +19,7 @@ import tempfile
 from textwrap import dedent
 import unittest
 
-import mock
+from unittest import mock
 
 from swift.common.utils import config
 

test/unit/common/utils/test_ipaddrs.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import ctypes
-from mock import patch
+from unittest.mock import patch
 import socket
 import unittest
 

test/unit/common/utils/test_libc.py

@@ -21,7 +21,7 @@ import platform
 import tempfile
 import unittest
 
-import mock
+from unittest import mock
 
 from swift.common.utils import libc
 

test/unit/common/utils/test_logs.py

@@ -25,7 +25,7 @@ import time
 import unittest
 import eventlet
 import functools
-import mock
+from unittest import mock
 
 from io import StringIO
 import http.client

test/unit/common/utils/test_timestamp.py

@@ -18,7 +18,7 @@ import random
 import time
 import unittest
 
-import mock
+from unittest import mock
 
 from swift.common.utils import timestamp
 

test/unit/container/test_auditor.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import unittest
-import mock
+from unittest import mock
 import os
 
 from swift.common.utils import normalize_timestamp

test/unit/container/test_backend.py

@@ -44,7 +44,7 @@ from swift.common.utils import Timestamp, encode_timestamps, hash_path, \
     MD5_OF_EMPTY_STRING
 from swift.common.storage_policy import POLICIES
 
-import mock
+from unittest import mock
 
 from test import annotate_failure
 from test.debug_logger import debug_logger

test/unit/container/test_reconciler.py

@@ -16,7 +16,7 @@ import shutil
 from functools import partial
 from tempfile import mkdtemp
 
-import mock
+from unittest import mock
 import operator
 import time
 import unittest

test/unit/container/test_replicator.py

@@ -18,7 +18,7 @@ import time
 import shutil
 import itertools
 import unittest
-import mock
+from unittest import mock
 import random
 import sqlite3
 

test/unit/container/test_server.py

@@ -17,7 +17,7 @@
 import operator
 import os
 import posix
-import mock
+from unittest import mock
 import unittest
 import itertools
 import time

test/unit/container/test_sharder.py

@@ -23,7 +23,7 @@ from contextlib import contextmanager
 from tempfile import mkdtemp
 from uuid import uuid4
 
-import mock
+from unittest import mock
 import unittest
 
 from collections import defaultdict
@@ -3690,8 +3690,8 @@ class TestSharder(BaseTestSharder):
 
         # repeat with handoff node and db_file error
         with self._mock_sharder(conf=conf) as sharder:
-            with mock.patch('os.stat', side_effect=OSError('test error')):
-                with mock_timestamp_now(now):
+            with mock_timestamp_now(now):
+                with mock.patch('os.stat', side_effect=OSError('test error')):
                     for broker in brokers:
                         sharder._identify_sharding_candidate(broker, {})
         stats_0_b = {'path': brokers[0].db_file,

test/unit/container/test_sync.py

@@ -18,7 +18,7 @@ import os
 import unittest
 from textwrap import dedent
 
-import mock
+from unittest import mock
 import errno
 from swift.common.utils import Timestamp, readconf
 from test.debug_logger import debug_logger

test/unit/container/test_sync_store.py

@@ -15,7 +15,7 @@
 
 import os
 import errno
-import mock
+from unittest import mock
 import random
 import logging
 import unittest

test/unit/container/test_updater.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import pickle
-import mock
+from unittest import mock
 import os
 import unittest
 from contextlib import closing

test/unit/helpers.py

@@ -28,7 +28,7 @@ import time
 import warnings
 
 from eventlet import spawn, wsgi
-import mock
+from unittest import mock
 from shutil import rmtree
 import pickle
 

test/unit/obj/test_auditor.py

@@ -15,7 +15,7 @@
 
 import unittest
 import json
-import mock
+from unittest import mock
 import os
 import signal
 import string