From f1f49798446a75e855d78e0a94cbc25a1965b696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 9 Jun 2020 01:20:28 +0200 Subject: [PATCH] Use unittest.mock instead of mock The mock third party library was needed for mock support in py2 runtimes. Since we now only support py36 and later, we can use the standard lib unittest.mock module instead. Change-Id: Ib3ca91e93db260e081c43d236d5d6fae5a2adfd7 --- lower-constraints.txt | 1 - magnum/tests/unit/common/cert_manager/test_barbican.py | 2 +- magnum/tests/unit/common/test_urlfetch.py | 2 +- .../tests/unit/conductor/handlers/common/test_trust_manager.py | 2 +- magnum/tests/unit/conductor/handlers/test_cluster_conductor.py | 2 +- .../tests/unit/conductor/handlers/test_k8s_cluster_conductor.py | 2 +- .../unit/conductor/handlers/test_mesos_cluster_conductor.py | 2 +- .../tests/unit/conductor/handlers/test_nodegroup_conductor.py | 2 +- .../unit/conductor/handlers/test_swarm_cluster_conductor.py | 2 +- magnum/tests/unit/conductor/test_utils.py | 2 +- magnum/tests/unit/drivers/test_heat_driver.py | 2 +- magnum/tests/unit/drivers/test_k8s_fedora_atomic_v1_driver.py | 2 +- 12 files changed, 11 insertions(+), 12 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index fdee35c371..7aa3fa9636 100644 --- a/lower-constraints.txt +++ b/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 diff --git a/magnum/tests/unit/common/cert_manager/test_barbican.py b/magnum/tests/unit/common/cert_manager/test_barbican.py index afd22b1a69..e98493b05a 100644 --- a/magnum/tests/unit/common/cert_manager/test_barbican.py +++ b/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 diff --git a/magnum/tests/unit/common/test_urlfetch.py b/magnum/tests/unit/common/test_urlfetch.py index 36d835319c..65d1913463 100644 --- a/magnum/tests/unit/common/test_urlfetch.py +++ b/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 diff --git a/magnum/tests/unit/conductor/handlers/common/test_trust_manager.py b/magnum/tests/unit/conductor/handlers/common/test_trust_manager.py index 2a69ebf9c8..749289fbb2 100644 --- a/magnum/tests/unit/conductor/handlers/common/test_trust_manager.py +++ b/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 diff --git a/magnum/tests/unit/conductor/handlers/test_cluster_conductor.py b/magnum/tests/unit/conductor/handlers/test_cluster_conductor.py index 2573f2743e..a04bf0508c 100644 --- a/magnum/tests/unit/conductor/handlers/test_cluster_conductor.py +++ b/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 diff --git a/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py b/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py index 68ca7fb288..0bb1e9d7b9 100644 --- a/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py +++ b/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 diff --git a/magnum/tests/unit/conductor/handlers/test_mesos_cluster_conductor.py b/magnum/tests/unit/conductor/handlers/test_mesos_cluster_conductor.py index 54eb77da3d..55549faa42 100644 --- a/magnum/tests/unit/conductor/handlers/test_mesos_cluster_conductor.py +++ b/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 diff --git a/magnum/tests/unit/conductor/handlers/test_nodegroup_conductor.py b/magnum/tests/unit/conductor/handlers/test_nodegroup_conductor.py index 41fe395901..fcbaba3670 100644 --- a/magnum/tests/unit/conductor/handlers/test_nodegroup_conductor.py +++ b/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 diff --git a/magnum/tests/unit/conductor/handlers/test_swarm_cluster_conductor.py b/magnum/tests/unit/conductor/handlers/test_swarm_cluster_conductor.py index 34608732e0..b057678d28 100644 --- a/magnum/tests/unit/conductor/handlers/test_swarm_cluster_conductor.py +++ b/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 diff --git a/magnum/tests/unit/conductor/test_utils.py b/magnum/tests/unit/conductor/test_utils.py index 7483d36eea..f36d930047 100644 --- a/magnum/tests/unit/conductor/test_utils.py +++ b/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 diff --git a/magnum/tests/unit/drivers/test_heat_driver.py b/magnum/tests/unit/drivers/test_heat_driver.py index ed63e8246b..2e9fc7106d 100644 --- a/magnum/tests/unit/drivers/test_heat_driver.py +++ b/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 diff --git a/magnum/tests/unit/drivers/test_k8s_fedora_atomic_v1_driver.py b/magnum/tests/unit/drivers/test_k8s_fedora_atomic_v1_driver.py index f0e7cb3e21..b0cd0aebf9 100644 --- a/magnum/tests/unit/drivers/test_k8s_fedora_atomic_v1_driver.py +++ b/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