From ff9280d24d09502414af3e7d8d2fd4c250133075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Mon, 8 Jun 2020 23:03: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: I821bf39f976be059f6e7e03b337d6f323787dcb0 --- .zuul.yaml | 1 - test-requirements.txt | 5 ----- unit_tests/test_nova_cell_controller_handlers.py | 2 +- 3 files changed, 1 insertion(+), 7 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/test_nova_cell_controller_handlers.py b/unit_tests/test_nova_cell_controller_handlers.py index 04c2f3e..56e02b2 100644 --- a/unit_tests/test_nova_cell_controller_handlers.py +++ b/unit_tests/test_nova_cell_controller_handlers.py @@ -15,7 +15,7 @@ from __future__ import absolute_import from __future__ import print_function -import mock +from unittest import mock import reactive.nova_cell_controller_handlers as handlers