From 9da66b4cc5c2631464f15de72932786f814bbfd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Mon, 8 Jun 2020 23:59:11 +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: I718a003c5f07e390457bc39e69871c7ecb533e7b --- .zuul.yaml | 1 - test-requirements.txt | 5 ----- unit_tests/test_actions.py | 4 ++-- unit_tests/test_actions_openstack_upgrade.py | 2 +- unit_tests/test_horizon_contexts.py | 2 +- unit_tests/test_horizon_hooks.py | 2 +- unit_tests/test_horizon_utils.py | 2 +- unit_tests/test_utils.py | 2 +- 8 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index b3037e94..0eed1965 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 f853625d..0aabe171 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,11 +13,6 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb requests>=2.18.4 -# 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' - stestr>=2.2.0 # Dependency of stestr. Workaround for diff --git a/unit_tests/test_actions.py b/unit_tests/test_actions.py index b58879ef..84fd30ca 100644 --- a/unit_tests/test_actions.py +++ b/unit_tests/test_actions.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock -from mock import patch +from unittest import mock +from unittest.mock import patch from unit_tests.test_utils import CharmTestCase diff --git a/unit_tests/test_actions_openstack_upgrade.py b/unit_tests/test_actions_openstack_upgrade.py index e3ed053e..1b8e0a34 100644 --- a/unit_tests/test_actions_openstack_upgrade.py +++ b/unit_tests/test_actions_openstack_upgrade.py @@ -15,7 +15,7 @@ import os import sys -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock os.environ['JUJU_UNIT_NAME'] = 'openstack-dashboard' diff --git a/unit_tests/test_horizon_contexts.py b/unit_tests/test_horizon_contexts.py index 7ecd8bc1..517918f4 100644 --- a/unit_tests/test_horizon_contexts.py +++ b/unit_tests/test_horizon_contexts.py @@ -14,7 +14,7 @@ from contextlib import contextmanager import io -from mock import MagicMock, patch +from unittest.mock import MagicMock, patch import hooks.horizon_contexts as horizon_contexts diff --git a/unit_tests/test_horizon_hooks.py b/unit_tests/test_horizon_hooks.py index b579d871..ae139b6a 100644 --- a/unit_tests/test_horizon_hooks.py +++ b/unit_tests/test_horizon_hooks.py @@ -14,7 +14,7 @@ import sys -from mock import MagicMock, patch, call +from unittest.mock import MagicMock, patch, call from unit_tests.test_utils import CharmTestCase # python-apt is not installed as part of test-requirements but is imported by diff --git a/unit_tests/test_horizon_utils.py b/unit_tests/test_horizon_utils.py index 8eac76a4..430aaae2 100644 --- a/unit_tests/test_horizon_utils.py +++ b/unit_tests/test_horizon_utils.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from mock import MagicMock, patch, call +from unittest.mock import MagicMock, patch, call from collections import OrderedDict # import charmhelpers.contrib.openstack.templating as templating # templating.OSConfigRenderer = MagicMock() diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py index 90862399..d9c3cd38 100644 --- a/unit_tests/test_utils.py +++ b/unit_tests/test_utils.py @@ -19,7 +19,7 @@ import unittest import yaml from contextlib import contextmanager -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock def load_config():