Merge "Use unittest.mock instead of mock"

glance/tests/unit/test_cache_middleware.py

@@ -12,7 +12,8 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from mock import patch
+from unittest.mock import patch
+
 from oslo_policy import policy
 # NOTE(jokke): simplified transition to py3, behaves like py2 xrange
 from six.moves import http_client as http

glance/tests/unit/test_quota.py

@@ -14,9 +14,9 @@
 #    under the License.
 import copy
 from unittest import mock
+from unittest.mock import patch
 import uuid
 
-from mock import patch
 from oslo_utils import encodeutils
 from oslo_utils import units
 

glance/tests/unit/test_scrubber.py

@@ -14,10 +14,10 @@
 #    under the License.
 
 from unittest import mock
+from unittest.mock import patch
 import uuid
 
 import glance_store
-from mock import patch
 from oslo_config import cfg
 # NOTE(jokke): simplified transition to py3, behaves like py2 xrange
 from six.moves import range

lower-constraints.txt

@@ -50,7 +50,6 @@ lxml==4.1.1
 Mako==1.0.7
 MarkupSafe==1.0
 mccabe==0.2.1
-mock==2.0.0
 mox3==0.25.0
 msgpack==0.5.6
 netaddr==0.7.19