From a0781dafff68e752c35f71eb6bf754ff037aa18b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Mon, 8 Jun 2020 22:35:04 +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: I6cf34358b919d4ab568a329395207676bd2e531d --- .zuul.yaml | 1 - test-requirements.txt | 5 ----- unit_tests/test_actions.py | 2 +- unit_tests/test_ceph_rbd_mirror_handlers.py | 2 +- unit_tests/test_lib_charm_openstack_ceph_rbd_mirror.py | 2 +- 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 34184f1..fd189e2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,3 @@ - project: templates: - - python35-charm-jobs - openstack-python3-ussuri-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/test_actions.py b/unit_tests/test_actions.py index d2349bf..270eb1a 100644 --- a/unit_tests/test_actions.py +++ b/unit_tests/test_actions.py @@ -14,7 +14,7 @@ import collections import json -import mock +from unittest import mock import sys sys.modules['charms.layer'] = mock.MagicMock() diff --git a/unit_tests/test_ceph_rbd_mirror_handlers.py b/unit_tests/test_ceph_rbd_mirror_handlers.py index a5bf162..3d5c5b2 100644 --- a/unit_tests/test_ceph_rbd_mirror_handlers.py +++ b/unit_tests/test_ceph_rbd_mirror_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 charm.openstack.ceph_rbd_mirror as crm import reactive.ceph_rbd_mirror_handlers as handlers diff --git a/unit_tests/test_lib_charm_openstack_ceph_rbd_mirror.py b/unit_tests/test_lib_charm_openstack_ceph_rbd_mirror.py index 739e65b..e0c1645 100644 --- a/unit_tests/test_lib_charm_openstack_ceph_rbd_mirror.py +++ b/unit_tests/test_lib_charm_openstack_ceph_rbd_mirror.py @@ -13,8 +13,8 @@ # limitations under the License. import collections -import mock import json +from unittest import mock import subprocess import charms_openstack.test_utils as test_utils