From d746757302beb385384f9c647afe68ce764bb3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Mon, 8 Jun 2020 22:44:46 +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: If1ef6178116ed8f1ce8f0244d72246292cdf52e9 --- .zuul.yaml | 2 +- test-requirements.txt | 1 - unit_tests/test_requires.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index af4b7f3..fd189e2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,3 +1,3 @@ - project: templates: - - openstack-python3-charm-jobs + - openstack-python3-ussuri-jobs diff --git a/test-requirements.txt b/test-requirements.txt index 5c881e6..0db6d61 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,6 +2,5 @@ flake8 stestr charms.reactive -mock>=1.2 coverage>=3.6 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack diff --git a/unit_tests/test_requires.py b/unit_tests/test_requires.py index f38c1b6..086e1e8 100644 --- a/unit_tests/test_requires.py +++ b/unit_tests/test_requires.py @@ -13,7 +13,7 @@ # limitations under the License. import json -import mock +from unittest import mock import requires from netaddr.core import AddrFormatError