From 50417cdb32449fb070d781dc980d344c5280af31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 9 Jun 2020 00:01:56 +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: I8757d430ab233f4a21d1d599f1a7a9a0dc68d7ef --- .zuul.yaml | 1 - swift_manager/test_manager.py | 2 +- test-requirements.txt | 5 ----- unit_tests/test_actions.py | 4 ++-- unit_tests/test_actions_openstack_upgrade.py | 2 +- unit_tests/test_swift_context.py | 2 +- unit_tests/test_swift_hooks.py | 2 +- unit_tests/test_swift_utils.py | 2 +- unit_tests/test_templates.py | 2 +- 9 files changed, 8 insertions(+), 14 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/swift_manager/test_manager.py b/swift_manager/test_manager.py index 93c073f..d7c6155 100644 --- a/swift_manager/test_manager.py +++ b/swift_manager/test_manager.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock import unittest import manager diff --git a/test-requirements.txt b/test-requirements.txt index f853625..0aabe17 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 0f078fe..ab924ef 100644 --- a/unit_tests/test_actions.py +++ b/unit_tests/test_actions.py @@ -17,11 +17,11 @@ import sys import tempfile import subprocess -import mock +from unittest import mock import yaml import unittest -from mock import patch, MagicMock, call +from unittest.mock import patch, MagicMock, call # python-apt is not installed as part of test-requirements but is imported by # some charmhelpers modules so create a fake import. diff --git a/unit_tests/test_actions_openstack_upgrade.py b/unit_tests/test_actions_openstack_upgrade.py index 3ee7fc9..9d91a36 100644 --- a/unit_tests/test_actions_openstack_upgrade.py +++ b/unit_tests/test_actions_openstack_upgrade.py @@ -17,7 +17,7 @@ import sys import unittest -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock os.environ['JUJU_UNIT_NAME'] = 'swift-proxy' diff --git a/unit_tests/test_swift_context.py b/unit_tests/test_swift_context.py index a368dd7..da83e39 100644 --- a/unit_tests/test_swift_context.py +++ b/unit_tests/test_swift_context.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 os import tempfile import unittest diff --git a/unit_tests/test_swift_hooks.py b/unit_tests/test_swift_hooks.py index 33c92a6..a182766 100644 --- a/unit_tests/test_swift_hooks.py +++ b/unit_tests/test_swift_hooks.py @@ -19,7 +19,7 @@ import uuid import unittest -from mock import ( +from unittest.mock import ( call, patch, MagicMock, diff --git a/unit_tests/test_swift_utils.py b/unit_tests/test_swift_utils.py index a9223d4..89f5346 100644 --- a/unit_tests/test_swift_utils.py +++ b/unit_tests/test_swift_utils.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -import mock +from unittest import mock import os import shutil import tempfile diff --git a/unit_tests/test_templates.py b/unit_tests/test_templates.py index c05049d..cc7eb6f 100644 --- a/unit_tests/test_templates.py +++ b/unit_tests/test_templates.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 unittest from jinja2 import Environment