Merge "Use mock from unittest"

This commit is contained in:
Zuul 2020-04-07 12:51:39 +00:00 committed by Gerrit Code Review
commit 12d7aab08b
4 changed files with 3 additions and 4 deletions

View file

@ -46,7 +46,6 @@ logutils==0.3.5
Mako==1.0.7
MarkupSafe==1.0
mccabe==0.2.1
mock==2.0.0
monotonic==1.4
mox3==0.25.0
msgpack-python==0.5.6

View file

@ -13,7 +13,7 @@
# under the License.
import copy
import mock
from unittest import mock
from oslo_utils import timeutils
from oslotest import base

View file

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from ironicclient import client
import ironicclient.common.apiclient.exceptions as ironic_exc

View file

@ -13,7 +13,7 @@
# under the License.
import mock
from unittest import mock
from neutron.db import provisioning_blocks
from neutron.plugins.ml2 import driver_context