Merge "Use unittest.mock instead of mock"

lower-constraints.txt

@@ -56,7 +56,6 @@ Mako==1.0.7
 marathon==0.8.6
 MarkupSafe==1.0
 mccabe==0.2.1
-mock==2.0.0
 monotonic==1.4
 mox3==0.25.0
 msgpack==0.5.6

magnum/tests/unit/common/cert_manager/test_barbican.py

@@ -18,7 +18,7 @@ import uuid
 from barbicanclient.v1 import client as barbican_client
 from barbicanclient.v1 import containers
 from barbicanclient.v1 import secrets
-from mock import patch
+from unittest.mock import patch
 
 from magnum.common.cert_manager import barbican_cert_manager as bcm
 from magnum.common.cert_manager import cert_manager

magnum/tests/unit/common/test_urlfetch.py

@@ -10,8 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from mock import patch
 from unittest import mock
+from unittest.mock import patch
 
 from oslo_config import cfg
 

magnum/tests/unit/conductor/handlers/common/test_trust_manager.py

@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from mock import patch
 from unittest import mock
+from unittest.mock import patch
 
 from magnum.common import exception
 from magnum.conductor.handlers.common import trust_manager

magnum/tests/unit/conductor/handlers/test_cluster_conductor.py

@@ -15,11 +15,11 @@
 # under the License.
 
 from unittest import mock
+from unittest.mock import patch
 
 import six
 
 from heatclient import exc
-from mock import patch
 from oslo_service import loopingcall
 from pycadf import cadftaxonomy as taxonomy
 

magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py

@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from mock import patch
 from unittest import mock
+from unittest.mock import patch
 
 import magnum.conf
 from magnum.drivers.k8s_coreos_v1 import driver as k8s_coreos_dr

magnum/tests/unit/conductor/handlers/test_mesos_cluster_conductor.py

@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from mock import patch
 from unittest import mock
+from unittest.mock import patch
 
 from magnum.drivers.heat import driver as heat_driver
 from magnum.drivers.mesos_ubuntu_v1 import driver as mesos_dr

magnum/tests/unit/conductor/handlers/test_nodegroup_conductor.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mock import patch
 from unittest import mock
+from unittest.mock import patch
 
 from heatclient import exc
 

magnum/tests/unit/conductor/handlers/test_swarm_cluster_conductor.py

@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from mock import patch
 from unittest import mock
+from unittest.mock import patch
 
 import magnum.conf
 from magnum.drivers.heat import driver as heat_driver

magnum/tests/unit/conductor/test_utils.py

@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from mock import patch
 from unittest import mock
+from unittest.mock import patch
 
 from magnum.conductor import utils
 from magnum import objects

magnum/tests/unit/drivers/test_heat_driver.py

@@ -10,8 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from mock import patch
 from unittest import mock
+from unittest.mock import patch
 
 from heatclient import exc as heatexc
 from oslo_utils import uuidutils

magnum/tests/unit/drivers/test_k8s_fedora_atomic_v1_driver.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mock import patch
+from unittest.mock import patch
 
 from magnum.common import exception
 from magnum.drivers.k8s_fedora_atomic_v1 import driver