x/vmware-nsx
Code Issues Proposed changes

Merge "NSXv: mock spawn_n when runnign unittests"

Browse Source
This commit is contained in:
Jenkins 2016-04-19 16:11:15 +00:00 committed by Gerrit Code Review
commit 9f50df6f7e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmware_nsx/tests/unit/nsx_v/test_plugin.py
View File

@ -48,6 +48,7 @@ import webob.exc
from vmware_nsx._i18n import _ from vmware_nsx._i18n import _
from vmware_nsx.common import exceptions as nsxv_exc from vmware_nsx.common import exceptions as nsxv_exc
from vmware_nsx.common import nsx_constants from vmware_nsx.common import nsx_constants
from vmware_nsx.common import utils as c_utils
from vmware_nsx.db import nsxv_db from vmware_nsx.db import nsxv_db
from vmware_nsx.dvs import dvs from vmware_nsx.dvs import dvs
from vmware_nsx.dvs import dvs_utils from vmware_nsx.dvs import dvs_utils
@ -2894,6 +2895,7 @@ class NsxVSecurityGroupsTestCase(ext_sg.SecurityGroupDBTestCase):
mock_delete_dhcp_service = mock.patch("%s.%s" % ( mock_delete_dhcp_service = mock.patch("%s.%s" % (
vmware.EDGE_MANAGE_NAME, 'delete_dhcp_edge_service')) vmware.EDGE_MANAGE_NAME, 'delete_dhcp_edge_service'))
mock_delete_dhcp_service.start() mock_delete_dhcp_service.start()
c_utils.spawn_n = mock.Mock(side_effect=lambda f: f())
super(NsxVSecurityGroupsTestCase, self).setUp(plugin=plugin, super(NsxVSecurityGroupsTestCase, self).setUp(plugin=plugin,
ext_mgr=ext_mgr) ext_mgr=ext_mgr)
self.plugin = manager.NeutronManager.get_plugin() self.plugin = manager.NeutronManager.get_plugin()