Merge "Use unittest.mock instead of PyPI mock"

kolla/tests/base.py

@@ -11,9 +11,9 @@
 # limitations under the License.
 
 import os
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_config import cfg
 from oslotest import base as oslotest_base
 

kolla/tests/test_build.py

@@ -12,10 +12,10 @@
 
 import fixtures
 import itertools
-import mock
 import os
 import requests
 import sys
+from unittest import mock
 
 from kolla.cmd import build as build_cmd
 from kolla import exception

lower-constraints.txt

@@ -37,7 +37,6 @@ keystoneauth1==3.4.0
 linecache2==1.0.0
 MarkupSafe==1.0
 mccabe==0.2.1
-mock==2.0.0
 monotonic==1.4
 mox3==0.25.0
 msgpack==0.5.6

tests/test_build.py

@@ -13,8 +13,8 @@
 import multiprocessing
 import os
 import sys
+from unittest.mock import patch
 
-from mock import patch
 from oslo_log import fixture as log_fixture
 from oslo_log import log as logging
 from oslotest import base

tests/test_set_config.py

@@ -13,9 +13,9 @@
 import copy
 import imp
 import json
-import mock
 import os.path
 import sys
+from unittest import mock
 
 from oslotest import base