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
This commit is contained in:
Hervé Beraud 2020-06-09 01:20:28 +02:00
parent 9f4c63a0df
commit f1f4979844
12 changed files with 11 additions and 12 deletions

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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