diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-01 05:18:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-01 05:18:10 +0000 |
| commit | c5a14a88cfe099cb79f6265c4b70a06293a927e8 (patch) | |
| tree | 62c7d8403131fa191754b9baf706673e9177221a | |
| parent | 01c230e793043310614d5b88096476ce0eac2c78 (diff) | |
| parent | eab4382df8494b1c411fe0754acddfacfd503578 (diff) | |
| download | heat-c5a14a88cfe099cb79f6265c4b70a06293a927e8.tar.gz | |
Merge "Use unittest.mock instead of mock"
| -rw-r--r-- | heat/tests/openstack/ironic/test_port.py | 3 | ||||
| -rw-r--r-- | lower-constraints.txt | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/heat/tests/openstack/ironic/test_port.py b/heat/tests/openstack/ironic/test_port.py index ac603ea95..4e9326f54 100644 --- a/heat/tests/openstack/ironic/test_port.py +++ b/heat/tests/openstack/ironic/test_port.py @@ -12,8 +12,9 @@ # under the License. import copy +from unittest import mock + from ironicclient.common.apiclient import exceptions as ic_exc -import mock from oslo_config import cfg from heat.common import exception diff --git a/lower-constraints.txt b/lower-constraints.txt index 35874684d..d2699c73e 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -48,7 +48,6 @@ lxml==3.4.1 Mako==1.0.7 MarkupSafe==1.0 mccabe==0.2.1 -mock==2.0.0 monotonic==1.4 msgpack==0.5.6 munch==2.2.0 |