Browse Source

Merge "Use mock from unittest"

tags/2.0.0
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
12d7aab08b
4 changed files with 3 additions and 4 deletions
  1. +0
    -1
      lower-constraints.txt
  2. +1
    -1
      networking_baremetal/tests/unit/ironic_agent/test_hashring_member_manager.py
  3. +1
    -1
      networking_baremetal/tests/unit/ironic_agent/test_ironic_agent.py
  4. +1
    -1
      networking_baremetal/tests/unit/plugins/ml2/test_baremetal_mech.py

+ 0
- 1
lower-constraints.txt 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


+ 1
- 1
networking_baremetal/tests/unit/ironic_agent/test_hashring_member_manager.py 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


+ 1
- 1
networking_baremetal/tests/unit/ironic_agent/test_ironic_agent.py 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


+ 1
- 1
networking_baremetal/tests/unit/plugins/ml2/test_baremetal_mech.py 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


Loading…
Cancel
Save