diff --git a/test-requirements.txt b/test-requirements.txt index 7d9c2587..2422e284 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,7 +9,6 @@ # charm-tools>=2.4.4 requests>=2.18.4 -mock>=1.2 flake8>=2.2.4,<=2.4.1 stestr>=2.2.0 coverage>=4.5.2 diff --git a/unit_tests/test_actions.py b/unit_tests/test_actions.py index 3195d375..06c81fc4 100644 --- a/unit_tests/test_actions.py +++ b/unit_tests/test_actions.py @@ -1,6 +1,6 @@ import sys -import mock -from mock import MagicMock +from unittest import mock +from unittest.mock import MagicMock from test_utils import CharmTestCase diff --git a/unit_tests/test_actions_openstack_upgrade.py b/unit_tests/test_actions_openstack_upgrade.py index 7637d06b..5919eb87 100644 --- a/unit_tests/test_actions_openstack_upgrade.py +++ b/unit_tests/test_actions_openstack_upgrade.py @@ -1,4 +1,4 @@ -from mock import patch +from unittest.mock import patch import os from test_utils import ( diff --git a/unit_tests/test_neutron_contexts.py b/unit_tests/test_neutron_contexts.py index 48b7a6b7..3f3e272c 100644 --- a/unit_tests/test_neutron_contexts.py +++ b/unit_tests/test_neutron_contexts.py @@ -2,7 +2,7 @@ import io from contextlib import contextmanager -from mock import ( +from unittest.mock import ( MagicMock, patch ) diff --git a/unit_tests/test_neutron_hooks.py b/unit_tests/test_neutron_hooks.py index b3f7bd1f..b7f3a190 100644 --- a/unit_tests/test_neutron_hooks.py +++ b/unit_tests/test_neutron_hooks.py @@ -1,6 +1,6 @@ import sys -from mock import MagicMock, patch, call +from unittest.mock import MagicMock, patch, call # python-apt is not installed as part of test-requirements but is imported by # some charmhelpers modules so create a fake import. diff --git a/unit_tests/test_neutron_utils.py b/unit_tests/test_neutron_utils.py index 548971e6..57b82263 100644 --- a/unit_tests/test_neutron_utils.py +++ b/unit_tests/test_neutron_utils.py @@ -1,4 +1,4 @@ -from mock import MagicMock, call, patch, ANY +from unittest.mock import MagicMock, call, patch, ANY import charmhelpers.core.hookenv as hookenv import neutron_utils diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py index 3272028c..a077ebd2 100644 --- a/unit_tests/test_utils.py +++ b/unit_tests/test_utils.py @@ -4,7 +4,7 @@ import logging import unittest import yaml -from mock import patch +from unittest.mock import patch def load_config():