From 0c1b1f1a508060480e562bc2e3d9740637d876bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Mon, 8 Jun 2020 23:00:05 +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: I38b8a9d40577e97bf7c5e73630fc044c3356c902 --- test-requirements.txt | 5 ----- unit_tests/__init__.py | 2 +- unit_tests/test_lib_charm_openstack_manila.py | 2 +- unit_tests/test_manila_handlers.py | 2 +- 4 files changed, 3 insertions(+), 8 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/__init__.py b/unit_tests/__init__.py index 566ae71..442ac4b 100644 --- a/unit_tests/__init__.py +++ b/unit_tests/__init__.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +import unittest.mock as mock import sys sys.path.append('src') diff --git a/unit_tests/test_lib_charm_openstack_manila.py b/unit_tests/test_lib_charm_openstack_manila.py index b52c381..f325f32 100644 --- a/unit_tests/test_lib_charm_openstack_manila.py +++ b/unit_tests/test_lib_charm_openstack_manila.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 charmhelpers diff --git a/unit_tests/test_manila_handlers.py b/unit_tests/test_manila_handlers.py index ca42f95..31fbb8e 100644 --- a/unit_tests/test_manila_handlers.py +++ b/unit_tests/test_manila_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_handlers as handlers