Merge "Use unittest.mock instead of mock"
This commit is contained in:
@@ -53,7 +53,6 @@ Mako==1.0.7
|
|||||||
MarkupSafe==1.0
|
MarkupSafe==1.0
|
||||||
mccabe==0.2.1
|
mccabe==0.2.1
|
||||||
microversion_parse==0.2.1
|
microversion_parse==0.2.1
|
||||||
mock==2.0.0
|
|
||||||
monotonic==1.4
|
monotonic==1.4
|
||||||
mox3==0.25.0
|
mox3==0.25.0
|
||||||
msgpack==0.5.6
|
msgpack==0.5.6
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
from mock import MagicMock
|
from unittest.mock import MagicMock
|
||||||
|
|
||||||
from watcher.common import exception
|
from watcher.common import exception
|
||||||
from watcher.decision_engine.datasources import gnocchi
|
from watcher.decision_engine.datasources import gnocchi
|
||||||
|
|||||||
Reference in New Issue
Block a user