From 55387a4f4a6f4b6444cc3bdf5407bcd3f5278ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 9 Jun 2020 12:08:14 +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. Change-Id: Ib4184a05e753c3d1368167b91fc43bcc64a176c3 --- openstack_requirements/tests/test_check_constraints.py | 3 ++- openstack_requirements/tests/test_update.py | 2 +- test-requirements.txt | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openstack_requirements/tests/test_check_constraints.py b/openstack_requirements/tests/test_check_constraints.py index 535ca49fa9..4a0e7f24be 100644 --- a/openstack_requirements/tests/test_check_constraints.py +++ b/openstack_requirements/tests/test_check_constraints.py @@ -11,8 +11,9 @@ # under the License. import io -import mock import os +from unittest import mock + import testscenarios import testtools diff --git a/openstack_requirements/tests/test_update.py b/openstack_requirements/tests/test_update.py index 9cc94a590d..b3e95a9e1c 100644 --- a/openstack_requirements/tests/test_update.py +++ b/openstack_requirements/tests/test_update.py @@ -15,9 +15,9 @@ import six import sys import textwrap +from unittest import mock import fixtures -import mock import testscenarios import testtools from testtools import matchers diff --git a/test-requirements.txt b/test-requirements.txt index 2e078495fb..3239557c05 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,5 +8,4 @@ testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT virtualenv>=14.0.6 # MIT setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0.0 # PSF/ZPL -mock>=2.0.0 # BSD bashate>=0.5.1 # Apache-2.0