openstack
/
neutron
Code Issues Proposed changes

Merge "Improve patching of sys.argv"

This commit is contained in:
Zuul 2018-07-14 15:32:51 +00:00 committed by Gerrit Code Review
parent e8168345ef b9ef562021
commit 511eeab7b2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/tests/unit/agent/dhcp/test_agent.py
View File

@ -255,10 +255,11 @@ class TestDhcpAgent(base.BaseTestCase):
'periodic_resync',
autospec=True) as mock_periodic_resync:
with mock.patch(state_rpc_str) as state_rpc:
with mock.patch.object(sys, 'argv') as sys_argv:
sys_argv.return_value = [
'dhcp', '--config-file',
base.etcdir('neutron.conf')]
test_args = [
'dhcp', '--config-file',
base.etcdir('neutron.conf')
]
with mock.patch.object(sys, 'argv', test_args):
cfg.CONF.register_opts(dhcp_config.DHCP_AGENT_OPTS)
config.register_interface_driver_opts_helper(cfg.CONF)
config.register_agent_state_opts_helper(cfg.CONF)