diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-24 18:07:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-24 18:07:47 +0000 |
| commit | 702f6b2aa4f545f09dbe9481d8759fe74fd446e8 (patch) | |
| tree | 6f6d8aff66ec86313f915ad4217cbb164c0aedd9 | |
| parent | 1835dff2e172f34226dbf09750915f83fac289de (diff) | |
| parent | d3159d4b6014582cceb1da1d60b8f0ad83f3c15a (diff) | |
| download | oslo-serialization-702f6b2aa4f545f09dbe9481d8759fe74fd446e8.tar.gz | |
Merge "Use unittest.mock instead of third party mock"
| -rw-r--r-- | lower-constraints.txt | 1 | ||||
| -rw-r--r-- | oslo_serialization/tests/test_jsonutils.py | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/lower-constraints.txt b/lower-constraints.txt index 8675c23..4b0da0e 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -14,7 +14,6 @@ iso8601==0.1.11 keystoneauth1==3.4.0 linecache2==1.0.0 mccabe==0.2.1 -mock==2.0.0 mox3==0.20.0 msgpack==0.5.2 netaddr==0.7.18 diff --git a/oslo_serialization/tests/test_jsonutils.py b/oslo_serialization/tests/test_jsonutils.py index 2a8de67..e04b9dc 100644 --- a/oslo_serialization/tests/test_jsonutils.py +++ b/oslo_serialization/tests/test_jsonutils.py @@ -20,9 +20,9 @@ import io import ipaddress import itertools import json +from unittest import mock from xmlrpc import client as xmlrpclib -import mock import netaddr from oslo_i18n import fixture from oslotest import base as test_base diff --git a/test-requirements.txt b/test-requirements.txt index 232fb68..628bfee 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,6 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. hacking>=1.1.0,<1.2.0 # Apache-2.0 -mock>=2.0.0 # BSD netaddr>=0.7.18 # BSD stestr>=2.0.0 # Apache-2.0 |