Merge "Use unittest.mock instead of third party mock"

Zuul · openstack-gerrit · commit 4886b023805c · 2020-04-17T21:37:39.000Z
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`	`#`
`15`	`15`
`16`	`16`	`import copy`
	`17`	`+from unittest import mock`
`17`	`18`
`18`		`-import mock`
`19`	`19`	`from osc_lib import exceptions`
`20`	`20`	`from osc_lib import utils`
`21`	`21`