From 5fe099ee3065400e16902eadf009682e21852e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Mon, 8 Jun 2020 22:46:08 +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: Id1cb42a412de130a85ec48695ecdbbadc9df7a6c --- test-requirements.txt | 1 - unit_tests/test_requires.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 9326b6f..993e44a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,6 +2,5 @@ flake8 stestr>=2.2.0 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 2e4a9eb..94cb5b1 100644 --- a/unit_tests/test_requires.py +++ b/unit_tests/test_requires.py @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock import requires