Merge "Use unittest.mock instead of third party mock"

This commit is contained in:
Zuul 2020-05-26 13:13:34 +00:00 committed by Gerrit Code Review
commit f51744b4fe
9 changed files with 13 additions and 17 deletions

View File

@ -45,7 +45,6 @@ logutils==0.3.5
Mako==0.4.0 Mako==0.4.0
MarkupSafe==1.0 MarkupSafe==1.0
mccabe==0.2.1 mccabe==0.2.1
mock==2.0.0
monotonic==0.6 monotonic==0.6
mox3==0.20.0 mox3==0.20.0
msgpack-python==0.4.0 msgpack-python==0.4.0

View File

@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import mock from unittest import mock
from neutron_lib import context
from neutron.tests import base from neutron.tests import base
from neutron_lib import context
from neutron_dynamic_routing.api.rpc.agentnotifiers import bgp_dr_rpc_agent_api from neutron_dynamic_routing.api.rpc.agentnotifiers import bgp_dr_rpc_agent_api

View File

@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import mock from unittest import mock
from neutron_lib.plugins import directory
from neutron.tests import base from neutron.tests import base
from neutron_lib.plugins import directory
from neutron_dynamic_routing.api.rpc.handlers import bgp_speaker_rpc from neutron_dynamic_routing.api.rpc.handlers import bgp_speaker_rpc
from neutron_dynamic_routing.extensions import bgp as bgp_ext from neutron_dynamic_routing.extensions import bgp as bgp_ext

View File

@ -13,8 +13,8 @@
# under the License. # under the License.
import contextlib import contextlib
from unittest import mock
import mock
import netaddr import netaddr
from neutron.db import l3_dvr_ha_scheduler_db from neutron.db import l3_dvr_ha_scheduler_db
from neutron.tests.unit.extensions import test_l3 from neutron.tests.unit.extensions import test_l3

View File

@ -15,9 +15,9 @@
import copy import copy
import sys import sys
from unittest import mock
import eventlet import eventlet
import mock
from neutron_lib import context from neutron_lib import context
from oslo_config import cfg from oslo_config import cfg
from oslo_utils import uuidutils from oslo_utils import uuidutils

View File

@ -13,15 +13,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import six from unittest import mock
import mock from neutron.tests import base
from os_ken.services.protocols.bgp import bgpspeaker from os_ken.services.protocols.bgp import bgpspeaker
from os_ken.services.protocols.bgp.rtconf.neighbors import CONNECT_MODE_ACTIVE from os_ken.services.protocols.bgp.rtconf.neighbors import CONNECT_MODE_ACTIVE
from oslo_config import cfg from oslo_config import cfg
from oslo_utils import encodeutils from oslo_utils import encodeutils
import six
from neutron.tests import base
from neutron_dynamic_routing.services.bgp.agent import config as bgp_config from neutron_dynamic_routing.services.bgp.agent import config as bgp_config
from neutron_dynamic_routing.services.bgp.agent.driver import exceptions as bgp_driver_exc # noqa from neutron_dynamic_routing.services.bgp.agent.driver import exceptions as bgp_driver_exc # noqa

View File

@ -13,15 +13,14 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import mock from unittest import mock
import testscenarios
from neutron.tests.unit import testlib_api
from neutron_lib.callbacks import events from neutron_lib.callbacks import events
from neutron_lib.callbacks import registry from neutron_lib.callbacks import registry
from neutron_lib import context from neutron_lib import context
from oslo_utils import importutils from oslo_utils import importutils
import testscenarios
from neutron.tests.unit import testlib_api
from neutron_dynamic_routing.api.rpc.callbacks import resources as dr_resources from neutron_dynamic_routing.api.rpc.callbacks import resources as dr_resources
from neutron_dynamic_routing.db import bgp_db from neutron_dynamic_routing.db import bgp_db

View File

@ -14,7 +14,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import mock from unittest import mock
from neutron.tests import base from neutron.tests import base
from neutron_lib.callbacks import events from neutron_lib.callbacks import events

View File

@ -6,7 +6,6 @@ hacking>=1.1.0,<1.2.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD
flake8-import-order==0.12 # LGPLv3 flake8-import-order==0.12 # LGPLv3
mock>=2.0.0 # BSD
python-subunit>=1.0.0 # Apache-2.0/BSD python-subunit>=1.0.0 # Apache-2.0/BSD
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.5 # BSD sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.5 # BSD
sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD