Fixed after Jay's review.
Integrated code from Soren (we now use the same 'magic number' for images without kernel & ramdisk.
This commit is contained in:
2
Authors
2
Authors
@@ -27,6 +27,7 @@ Paul Voccio <paul@openstack.org>
|
|||||||
Rick Clark <rick@openstack.org>
|
Rick Clark <rick@openstack.org>
|
||||||
Ryan Lane <rlane@wikimedia.org>
|
Ryan Lane <rlane@wikimedia.org>
|
||||||
Ryan Lucio <rlucio@internap.com>
|
Ryan Lucio <rlucio@internap.com>
|
||||||
|
Salvatore Orlando <salvatore.orlando@eu.citrix.com>
|
||||||
Sandy Walsh <sandy.walsh@rackspace.com>
|
Sandy Walsh <sandy.walsh@rackspace.com>
|
||||||
Soren Hansen <soren.hansen@rackspace.com>
|
Soren Hansen <soren.hansen@rackspace.com>
|
||||||
Thierry Carrez <thierry@openstack.org>
|
Thierry Carrez <thierry@openstack.org>
|
||||||
@@ -35,3 +36,4 @@ Trey Morris <trey.morris@rackspace.com>
|
|||||||
Vishvananda Ishaya <vishvananda@gmail.com>
|
Vishvananda Ishaya <vishvananda@gmail.com>
|
||||||
Youcef Laribi <Youcef.Laribi@eu.citrix.com>
|
Youcef Laribi <Youcef.Laribi@eu.citrix.com>
|
||||||
Zhixue Wu <Zhixue.Wu@citrix.com>
|
Zhixue Wu <Zhixue.Wu@citrix.com>
|
||||||
|
|
||||||
|
|||||||
@@ -157,7 +157,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(
|
||||||
|
|||||||
Reference in New Issue
Block a user