x/vmware-nsx
Code Issues Proposed changes

Merge "Fix haproxy agent unit test to be runnable alone by tox"

Browse Source
This commit is contained in:
Jenkins 2013-09-16 09:41:32 +00:00 committed by Gerrit Code Review
commit 495bdeb580
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_agent.py
View File

@ -29,8 +29,6 @@ class TestLbaasService(base.BaseTestCase):
super(TestLbaasService, self).setUp() super(TestLbaasService, self).setUp()
self.addCleanup(cfg.CONF.reset) self.addCleanup(cfg.CONF.reset)
cfg.CONF.register_opts(agent.OPTS)
def test_start(self): def test_start(self):
with mock.patch.object( with mock.patch.object(
agent.rpc_service.Service, 'start' agent.rpc_service.Service, 'start'
@ -49,8 +47,9 @@ class TestLbaasService(base.BaseTestCase):
mock.patch.object(agent.service, 'launch'), mock.patch.object(agent.service, 'launch'),
mock.patch.object(agent, 'eventlet'), mock.patch.object(agent, 'eventlet'),
mock.patch('sys.argv'), mock.patch('sys.argv'),
mock.patch.object(agent.manager, 'LbaasAgentManager') mock.patch.object(agent.manager, 'LbaasAgentManager'),
) as (mock_logging, mock_launch, mock_eventlet, sys_argv, mgr_cls): mock.patch.object(cfg.CONF, 'register_opts')
) as (mock_logging, mock_launch, mock_eventlet, sys_argv, mgr_cls, ro):
agent.main() agent.main()
self.assertTrue(mock_eventlet.monkey_patch.called) self.assertTrue(mock_eventlet.monkey_patch.called)