x/python-ganttclient
Code Issues Proposed changes

Merge "External locking for image caching."

Browse Source
This commit is contained in:
Jenkins
2012-08-30 19:34:18 +00:00
committed by Gerrit Code Review
parent 623eb4146a cc1e97cc0d
commit 1b9006b186
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/tests/test_imagebackend.py
View File

@@ -35,7 +35,8 @@ class _ImageTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(_ImageTestCase, self).setUp() super(_ImageTestCase, self).setUp()
self.flags(instances_path=self.INSTANCES_PATH) self.flags(disable_process_locking=True,
instances_path=self.INSTANCES_PATH)
self.INSTANCE = 'instance' self.INSTANCE = 'instance'
self.NAME = 'fake.vm' self.NAME = 'fake.vm'
self.TEMPLATE = 'template' self.TEMPLATE = 'template'

14
nova/tests/test_xenapi.py
View File

@@ -146,10 +146,11 @@ 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(xenapi_connection_url='test_url', self.flags(disable_process_locking=True,
xenapi_connection_password='test_pass',
firewall_driver='nova.virt.xenapi.firewall.' firewall_driver='nova.virt.xenapi.firewall.'
'Dom0IptablesFirewallDriver') 'Dom0IptablesFirewallDriver',
xenapi_connection_url='test_url',
xenapi_connection_password='test_pass')
db_fakes.stub_out_db_instance_api(self.stubs) db_fakes.stub_out_db_instance_api(self.stubs)
self.instance_values = {'id': 1, self.instance_values = {'id': 1,
'project_id': self.user_id, 'project_id': self.user_id,
@@ -260,11 +261,12 @@ class XenAPIVMTestCase(stubs.XenAPITestBase):
def setUp(self): def setUp(self):
super(XenAPIVMTestCase, self).setUp() super(XenAPIVMTestCase, self).setUp()
self.network = importutils.import_object(FLAGS.network_manager) self.network = importutils.import_object(FLAGS.network_manager)
self.flags(xenapi_connection_url='test_url', self.flags(disable_process_locking=True,
xenapi_connection_password='test_pass',
instance_name_template='%d', instance_name_template='%d',
firewall_driver='nova.virt.xenapi.firewall.' firewall_driver='nova.virt.xenapi.firewall.'
'Dom0IptablesFirewallDriver') 'Dom0IptablesFirewallDriver',
xenapi_connection_url='test_url',
xenapi_connection_password='test_pass',)
xenapi_fake.create_local_srs() xenapi_fake.create_local_srs()
xenapi_fake.create_local_pifs() xenapi_fake.create_local_pifs()
db_fakes.stub_out_db_instance_api(self.stubs) db_fakes.stub_out_db_instance_api(self.stubs)