openstack
/
neutron
Code Issues Proposed changes

Unittests improvement 

During config opts refactor, some changes were introduced, which caused
problems to run unittests with pdb. This change address some of them.

Change-Id: I4d4e1dc5606a81761ef12f60fb7feba3be88d1fc
This commit is contained in:
Darek Smigiel 2016-12-06 22:12:20 +00:00
parent 24b5a3b73e
commit 2cedbf2967
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/tests/unit/extensions/test_segment.py
View File

@ -24,6 +24,7 @@ from neutron.callbacks import events
from neutron.callbacks import exceptions
from neutron.callbacks import registry
from neutron.callbacks import resources
from neutron.conf.plugins.ml2.drivers import driver_type
from neutron import context
from neutron.db import agents_db
from neutron.db import agentschedulers_db
@ -461,6 +462,13 @@ class HostSegmentMappingTestCase(SegmentTestCase):
config.cfg.CONF.set_override('mechanism_drivers',
self._mechanism_drivers,
group='ml2')
# NOTE(dasm): ml2_type_vlan requires to be registered before used.
# This piece was refactored and removed from .config, so it causes
# a problem, when tests are executed with pdb.
# There is no problem when tests are running without debugger.
driver_type.register_ml2_drivers_vlan_opts()
config.cfg.CONF.set_override('network_vlan_ranges',
['phys_net1', 'phys_net2'],
group='ml2_type_vlan')

7
neutron/tests/unit/plugins/ml2/test_port_binding.py
View File

@ -17,6 +17,7 @@ import mock
from neutron_lib import constants as const
from neutron_lib.plugins import directory
from neutron.conf.plugins.ml2.drivers import driver_type
from neutron import context
from neutron.extensions import portbindings
from neutron.plugins.ml2 import config
@ -34,6 +35,12 @@ class PortBindingTestCase(test_plugin.NeutronDbPluginV2TestCase):
config.cfg.CONF.set_override('mechanism_drivers',
['logger', 'test'],
'ml2')
# NOTE(dasm): ml2_type_vlan requires to be registered before used.
# This piece was refactored and removed from .config, so it causes
# a problem, when tests are executed with pdb.
# There is no problem when tests are running without debugger.
driver_type.register_ml2_drivers_vlan_opts()
config.cfg.CONF.set_override('network_vlan_ranges',
['physnet1:1000:1099'],
group='ml2_type_vlan')