From 41d36e8b2eec2644070e42ff3bffa7a026816106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Mon, 8 Jun 2020 22:39:44 +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: Ie62d7878f7b952f35ca854cc36ee55b62af5f8c1 --- .zuul.yaml | 1 - test-requirements.txt | 5 ----- unit_tests/__init__.py | 2 +- unit_tests/test_designate_bind_handlers.py | 2 +- unit_tests/test_lib_charm_openstack_designate_bind.py | 3 ++- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index b3037e9..0eed196 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,4 @@ - project: templates: - - python35-charm-jobs - openstack-python3-ussuri-jobs - openstack-cover-jobs 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/__init__.py b/unit_tests/__init__.py index ea4c403..4db4197 100644 --- a/unit_tests/__init__.py +++ b/unit_tests/__init__.py @@ -13,7 +13,7 @@ # limitations under the License. import sys -import mock +from unittest import mock sys.path.append('src') sys.path.append('src/lib') diff --git a/unit_tests/test_designate_bind_handlers.py b/unit_tests/test_designate_bind_handlers.py index b40f0ee..c9654f6 100644 --- a/unit_tests/test_designate_bind_handlers.py +++ b/unit_tests/test_designate_bind_handlers.py @@ -14,7 +14,7 @@ import unittest -import mock +from unittest import mock import reactive.designate_bind_handlers as handlers diff --git a/unit_tests/test_lib_charm_openstack_designate_bind.py b/unit_tests/test_lib_charm_openstack_designate_bind.py index d9d736e..ad0fc4b 100644 --- a/unit_tests/test_lib_charm_openstack_designate_bind.py +++ b/unit_tests/test_lib_charm_openstack_designate_bind.py @@ -12,7 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock + +from unittest import mock import charms_openstack.test_utils as test_utils