x/gantt
Code Issues Proposed changes

Fix up tests

Browse Source
This commit is contained in:
Chuck Short
2011-03-17 10:41:55 -04:00
parent 5247e23382
commit 1decefaf64
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nova/tests/test_virt.py
View File

@@ -239,8 +239,8 @@ class LibvirtConnTestCase(test.TestCase):
network_ref = db.project_get_network(context.get_admin_context(), network_ref = db.project_get_network(context.get_admin_context(),
self.project.id) self.project.id)
fixed_ip = {'address': self.test_ip, fixed_ip = {'address': self.test_ip,
'network_id': network_ref['id']} 'network_id': network_ref['id']}
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
fixed_ip_ref = db.fixed_ip_create(ctxt, fixed_ip) fixed_ip_ref = db.fixed_ip_create(ctxt, fixed_ip)
@@ -259,13 +259,13 @@ class LibvirtConnTestCase(test.TestCase):
check = [ check = [
(lambda t: t.find('.').get('type'), 'lxc'), (lambda t: t.find('.').get('type'), 'lxc'),
(lambda t: t.find('./os/type').text, 'exe'), (lambda t: t.find('./os/type').text, 'exe')
] ]
for i, (check, expected_result) in enumerate(check): for i, (check, expected_result) in enumerate(check):
self.assertEqual(check(tree), self.assertEqual(check(tree),
expected_result, expected_result,
'%s failed common check %d' % (xml, i)) '%s failed common check %d' % (xml, i))
def _check_xml_and_uri(self, instance, expect_ramdisk, expect_kernel, def _check_xml_and_uri(self, instance, expect_ramdisk, expect_kernel,
rescue=False): rescue=False):
@@ -342,7 +342,6 @@ class LibvirtConnTestCase(test.TestCase):
(lambda t: t.find('./devices/serial/source').get( (lambda t: t.find('./devices/serial/source').get(
'path').split('/')[1], 'console.log'), 'path').split('/')[1], 'console.log'),
(lambda t: t.find('./memory').text, '2097152')] (lambda t: t.find('./memory').text, '2097152')]
if rescue: if rescue:
common_checks += [ common_checks += [
(lambda t: t.findall('./devices/disk/source')[0].get( (lambda t: t.findall('./devices/disk/source')[0].get(