summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-04-17 21:37:39 +0000
committerGerrit Code Review <review@openstack.org>2020-04-17 21:37:39 +0000
commit4886b023805c06cd2bd5d7beb47c6c4f63beb058 (patch)
treef63ad0409a459ea5e08286eeba23dea110f4ab39
parent790ead00bb48b708666690c5088490004aee0a58 (diff)
parent725e004d32d538f9d163c727308ee20385c0310d (diff)
downloadpython-openstackclient-4886b023805c06cd2bd5d7beb47c6c4f63beb058.tar.gz
Merge "Use unittest.mock instead of third party mock"
-rw-r--r--lower-constraints.txt1
-rw-r--r--openstackclient/tests/unit/identity/v3/test_access_rule.py2
-rw-r--r--test-requirements.txt1
3 files changed, 1 insertions, 3 deletions
diff --git a/lower-constraints.txt b/lower-constraints.txt
index b6879366..df79ef5d 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -44,7 +44,6 @@ kombu==4.0.0
linecache2==1.0.0
MarkupSafe==1.1.0
mccabe==0.2.1
-mock==2.0.0
monotonic==0.6
mox3==0.20.0
msgpack-python==0.4.0
diff --git a/openstackclient/tests/unit/identity/v3/test_access_rule.py b/openstackclient/tests/unit/identity/v3/test_access_rule.py
index f8b6093a..904fe323 100644
--- a/openstackclient/tests/unit/identity/v3/test_access_rule.py
+++ b/openstackclient/tests/unit/identity/v3/test_access_rule.py
@@ -14,8 +14,8 @@
#
import copy
+from unittest import mock
-import mock
from osc_lib import exceptions
from osc_lib import utils
diff --git a/test-requirements.txt b/test-requirements.txt
index bdbf716e..ed3cf0c0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,6 @@ hacking>=2.0.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
flake8-import-order>=0.13 # LGPLv3
-mock>=2.0.0 # BSD
oslotest>=3.2.0 # Apache-2.0
requests>=2.14.2 # Apache-2.0
requests-mock>=1.2.0 # Apache-2.0