From 60f3442e1364302a36335b12c27c5c9190d93e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 9 Jun 2020 12:20:48 +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: Ia50cc4538bf4e148f3870dafb414109d4ca9ccc1 --- doc/requirements.txt | 1 - lower-constraints.txt | 1 - test-requirements.txt | 1 - zaqar_ui/test/api_tests/test_rest_api.py | 2 +- zaqar_ui/test/helpers.py | 2 +- 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index a475cfa..2d407c4 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -7,7 +7,6 @@ # be installed in a specific order. # # Requirements for docs -mock>=2.0.0 # BSD openstackdocstheme>=2.2.1 # Apache-2.0 reno>=3.1.0 # Apache-2.0 sphinx>=2.0.0,!=2.1.0 # BSD diff --git a/lower-constraints.txt b/lower-constraints.txt index 4f8fb70..fdcd89c 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -41,7 +41,6 @@ keystoneauth1==3.4.0 linecache2==1.0.0 MarkupSafe==1.0 mccabe==0.2.1 -mock==2.0.0 monotonic==1.4 msgpack==0.5.6 munch==2.2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 7eac734..fa1456d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,5 +10,4 @@ hacking>=1.1.0,<1.2.0 # Apache-2.0 # coverage!=4.4,>=4.0 # Apache-2.0 -mock>=2.0.0 # BSD testtools>=2.2.0 # MIT diff --git a/zaqar_ui/test/api_tests/test_rest_api.py b/zaqar_ui/test/api_tests/test_rest_api.py index bbda6e7..3aed023 100644 --- a/zaqar_ui/test/api_tests/test_rest_api.py +++ b/zaqar_ui/test/api_tests/test_rest_api.py @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from openstack_dashboard.test import helpers as test from openstack_dashboard.test.test_data import utils diff --git a/zaqar_ui/test/helpers.py b/zaqar_ui/test/helpers.py index eb899c0..8b95a09 100644 --- a/zaqar_ui/test/helpers.py +++ b/zaqar_ui/test/helpers.py @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from openstack_dashboard.test import helpers from zaqarclient.queues.v2 import client as zaqar_client