Merge "Use unittest.mock instead of third party mock"4.1.1

9 files changed, 8 insertions, 11 deletions

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 57f2769..757a897 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -14,7 +14,6 @@ iso8601==0.1.11
 keystoneauth1==3.4.0
 linecache2==1.0.0
 mccabe==0.2.1
-mock==2.0.0
 netaddr==0.7.18
 netifaces==0.10.4
 os-client-config==1.28.0
diff --git a/oslo_utils/tests/test_eventletutils.py b/oslo_utils/tests/test_eventletutils.py
index d96851c..62b72af 100644
--- a/oslo_utils/tests/test_eventletutils.py
+++ b/oslo_utils/tests/test_eventletutils.py
@@ -13,11 +13,11 @@
 #    under the License.
 
 import threading
+from unittest import mock
 import warnings
 
 import eventlet
 from eventlet import greenthread
-import mock
 from oslotest import base as test_base
 import six
 
diff --git a/oslo_utils/tests/test_excutils.py b/oslo_utils/tests/test_excutils.py
index 204791f..011d016 100644
--- a/oslo_utils/tests/test_excutils.py
+++ b/oslo_utils/tests/test_excutils.py
@@ -13,9 +13,9 @@
 #    under the License.
 
 import logging
+from unittest import mock
 
 import fixtures
-import mock
 from oslotest import base as test_base
 
 from oslo_utils import excutils
diff --git a/oslo_utils/tests/test_fnmatch.py b/oslo_utils/tests/test_fnmatch.py
index 2c94dea..ae8415e 100644
--- a/oslo_utils/tests/test_fnmatch.py
+++ b/oslo_utils/tests/test_fnmatch.py
@@ -16,8 +16,8 @@ import fnmatch as standard_fnmatch
 import ntpath
 import posixpath
 import sys
+from unittest import mock
 
-import mock
 from oslotest import base
 import six
 
diff --git a/oslo_utils/tests/test_netutils.py b/oslo_utils/tests/test_netutils.py
index 856b671..31d9c75 100644
--- a/oslo_utils/tests/test_netutils.py
+++ b/oslo_utils/tests/test_netutils.py
@@ -15,8 +15,8 @@
 
 import contextlib
 import socket
+from unittest import mock
 
-import mock
 import netifaces
 from oslotest import base as test_base
 import six
diff --git a/oslo_utils/tests/test_strutils.py b/oslo_utils/tests/test_strutils.py
index a63ef23..f43cef2 100644
--- a/oslo_utils/tests/test_strutils.py
+++ b/oslo_utils/tests/test_strutils.py
@@ -18,9 +18,9 @@
 import collections
 import copy
 import math
+from unittest import mock
 
 import ddt
-import mock
 from oslotest import base as test_base
 import six
 import testscenarios
diff --git a/oslo_utils/tests/test_timeutils.py b/oslo_utils/tests/test_timeutils.py
index 77b1aa1..9466849 100644
--- a/oslo_utils/tests/test_timeutils.py
+++ b/oslo_utils/tests/test_timeutils.py
@@ -17,9 +17,9 @@ import calendar
 import datetime
 import logging
 import time
+from unittest import mock
 
 import iso8601
-import mock
 from oslotest import base as test_base
 from testtools import matchers
 
diff --git a/oslo_utils/tests/tests_encodeutils.py b/oslo_utils/tests/tests_encodeutils.py
index 834c6d2..546e8ea 100644
--- a/oslo_utils/tests/tests_encodeutils.py
+++ b/oslo_utils/tests/tests_encodeutils.py
@@ -15,7 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from oslo_i18n import fixture as oslo_i18n_fixture
 from oslotest import base as test_base
 import six
diff --git a/test-requirements.txt b/test-requirements.txt
index ff549ff..cf92323 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -17,9 +17,6 @@ stestr>=2.0.0 # Apache-2.0
 #  deps = {[testenv]deps} coverage
 coverage!=4.4,>=4.0 # Apache-2.0
 
-# mocking framework
-mock>=2.0.0 # BSD
-
 # used for oslotest cross-testing scripts
 oslo.config>=5.2.0 # Apache-2.0