Merge "Remove dependency on mock"

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