From d9a643d8e342e99f960135355af79ecd948bf387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Mon, 8 Jun 2020 23:00:58 +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: I55ccb5548917c8431b0080c956bec5543d31a9a3 --- .zuul.yaml | 2 +- test-requirements.txt | 5 ----- unit_tests/test_lib_charm_openstack_masakari.py | 2 +- unit_tests/test_masakari_handlers.py | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 7051aee..fd189e2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,3 +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_lib_charm_openstack_masakari.py b/unit_tests/test_lib_charm_openstack_masakari.py index 7f2ffd8..23b1c87 100644 --- a/unit_tests/test_lib_charm_openstack_masakari.py +++ b/unit_tests/test_lib_charm_openstack_masakari.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_masakari_handlers.py b/unit_tests/test_masakari_handlers.py index 81aa315..780390d 100644 --- a/unit_tests/test_masakari_handlers.py +++ b/unit_tests/test_masakari_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.masakari_handlers as handlers