From ab1d7e94a16674757f928efe9559d3c6724d50a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Mon, 8 Jun 2020 23:00:41 +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. Note that https://github.com/openstack/charms.openstack is used during tests and he need `mock`, unfortunatelly it doesn't declare `mock` in its requirements so it retrieve mock from other charm project (cross dependency). So we depend on charms.openstack first and when Ib1ed5b598a52375e29e247db9ab4786df5b6d142 will be merged then CI will pass without errors. Depends-On: Ib1ed5b598a52375e29e247db9ab4786df5b6d142 Change-Id: I609298d09de3806636b8a157f4ef81c1ab567bf7 --- test-requirements.txt | 5 ----- unit_tests/test_lib_charm_openstack_manila_generic.py | 2 +- unit_tests/test_manila_generic_handlers.py | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index bb1307f..208032f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -28,11 +28,6 @@ oslo.utils<=3.41.0;python_version<'3.6' requests>=2.18.4 charms.reactive -# Newer mock seems to have some syntax which is newer than python3.5 (e.g. -# f'{something}' -mock>=1.2,<4.0.0; python_version < '3.6' -mock>=1.2; python_version >= '3.6' - nose>=1.3.7 coverage>=3.6 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack diff --git a/unit_tests/test_lib_charm_openstack_manila_generic.py b/unit_tests/test_lib_charm_openstack_manila_generic.py index 1e5ec03..a2fd3fa 100644 --- a/unit_tests/test_lib_charm_openstack_manila_generic.py +++ b/unit_tests/test_lib_charm_openstack_manila_generic.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock import charm.openstack.manila_generic as manila_generic diff --git a/unit_tests/test_manila_generic_handlers.py b/unit_tests/test_manila_generic_handlers.py index d256384..29f8ca2 100644 --- a/unit_tests/test_manila_generic_handlers.py +++ b/unit_tests/test_manila_generic_handlers.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock import reactive.manila_generic_handlers as handlers