x/python-ganttclient
Code Issues Proposed changes

Merge "Remove unnecessary target_host flag in xenapi driver tests"

Browse Source
This commit is contained in:
Jenkins
2012-07-05 19:05:51 +00:00
committed by Gerrit Code Review
parent 95d56eec29 96993ce28d
commit 8538f88f9a
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nova/tests/test_xenapi.py
View File

@@ -143,8 +143,7 @@ class XenAPIVolumeTestCase(stubs.XenAPITestBase):
self.user_id = 'fake' self.user_id = 'fake'
self.project_id = 'fake' self.project_id = 'fake'
self.context = context.RequestContext(self.user_id, self.project_id) self.context = context.RequestContext(self.user_id, self.project_id)
self.flags(target_host='127.0.0.1', self.flags(xenapi_connection_url='test_url',
xenapi_connection_url='test_url',
xenapi_connection_password='test_pass', xenapi_connection_password='test_pass',
firewall_driver='nova.virt.xenapi.firewall.' firewall_driver='nova.virt.xenapi.firewall.'
'Dom0IptablesFirewallDriver') 'Dom0IptablesFirewallDriver')
@@ -876,8 +875,7 @@ class XenAPIMigrateInstance(stubs.XenAPITestBase):
def setUp(self): def setUp(self):
super(XenAPIMigrateInstance, self).setUp() super(XenAPIMigrateInstance, self).setUp()
self.flags(target_host='127.0.0.1', self.flags(xenapi_connection_url='test_url',
xenapi_connection_url='test_url',
xenapi_connection_password='test_pass', xenapi_connection_password='test_pass',
firewall_driver='nova.virt.xenapi.firewall.' firewall_driver='nova.virt.xenapi.firewall.'
'Dom0IptablesFirewallDriver') 'Dom0IptablesFirewallDriver')
@@ -1168,8 +1166,7 @@ class XenAPIHostTestCase(stubs.XenAPITestBase):
class XenAPIAutoDiskConfigTestCase(stubs.XenAPITestBase): class XenAPIAutoDiskConfigTestCase(stubs.XenAPITestBase):
def setUp(self): def setUp(self):
super(XenAPIAutoDiskConfigTestCase, self).setUp() super(XenAPIAutoDiskConfigTestCase, self).setUp()
self.flags(target_host='127.0.0.1', self.flags(xenapi_connection_url='test_url',
xenapi_connection_url='test_url',
xenapi_connection_password='test_pass', xenapi_connection_password='test_pass',
firewall_driver='nova.virt.xenapi.firewall.' firewall_driver='nova.virt.xenapi.firewall.'
'Dom0IptablesFirewallDriver') 'Dom0IptablesFirewallDriver')
@@ -1259,8 +1256,7 @@ class XenAPIGenerateLocal(stubs.XenAPITestBase):
"""Test generating of local disks, like swap and ephemeral""" """Test generating of local disks, like swap and ephemeral"""
def setUp(self): def setUp(self):
super(XenAPIGenerateLocal, self).setUp() super(XenAPIGenerateLocal, self).setUp()
self.flags(target_host='127.0.0.1', self.flags(xenapi_connection_url='test_url',
xenapi_connection_url='test_url',
xenapi_connection_password='test_pass', xenapi_connection_password='test_pass',
xenapi_generate_swap=True, xenapi_generate_swap=True,
firewall_driver='nova.virt.xenapi.firewall.' firewall_driver='nova.virt.xenapi.firewall.'
@@ -1336,8 +1332,7 @@ class XenAPIBWUsageTestCase(stubs.XenAPITestBase):
super(XenAPIBWUsageTestCase, self).setUp() super(XenAPIBWUsageTestCase, self).setUp()
self.stubs.Set(vm_utils, 'compile_metrics', self.stubs.Set(vm_utils, 'compile_metrics',
XenAPIBWUsageTestCase._fake_compile_metrics) XenAPIBWUsageTestCase._fake_compile_metrics)
self.flags(target_host='127.0.0.1', self.flags(xenapi_connection_url='test_url',
xenapi_connection_url='test_url',
xenapi_connection_password='test_pass', xenapi_connection_password='test_pass',
firewall_driver='nova.virt.xenapi.firewall.' firewall_driver='nova.virt.xenapi.firewall.'
'Dom0IptablesFirewallDriver') 'Dom0IptablesFirewallDriver')