Merge "Use unittest.mock instead of mock"
This commit is contained in:
commit
c5a14a88cf
|
@ -12,8 +12,9 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import copy
|
import copy
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
from ironicclient.common.apiclient import exceptions as ic_exc
|
from ironicclient.common.apiclient import exceptions as ic_exc
|
||||||
import mock
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from heat.common import exception
|
from heat.common import exception
|
||||||
|
|
|
@ -48,7 +48,6 @@ lxml==3.4.1
|
||||||
Mako==1.0.7
|
Mako==1.0.7
|
||||||
MarkupSafe==1.0
|
MarkupSafe==1.0
|
||||||
mccabe==0.2.1
|
mccabe==0.2.1
|
||||||
mock==2.0.0
|
|
||||||
monotonic==1.4
|
monotonic==1.4
|
||||||
msgpack==0.5.6
|
msgpack==0.5.6
|
||||||
munch==2.2.0
|
munch==2.2.0
|
||||||
|
|
Loading…
Reference in New Issue