openstack/nova
Code Issues Proposed changes

Merge "More specific lxml versions in tools/pip-requires"

Browse Source
This commit is contained in:
Jenkins 2012-09-13 02:10:40 +00:00 committed by Gerrit Code Review
commit b99b8b9c0b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/test_libvirt_config.py
View File

@ -366,7 +366,7 @@ class LibvirtConfigGuestDiskTest(LibvirtConfigBaseTest):
self.assertXmlEqual(xml, """
<disk type="network" device="disk">
<driver name="qemu" type="qcow2"/>
<source name="foo.bar.com" protocol="iscsi"/>
<source protocol="iscsi" name="foo.bar.com"/>
<target bus="ide" dev="/dev/hda"/>
</disk>""")
@ -387,7 +387,7 @@ class LibvirtConfigGuestDiskTest(LibvirtConfigBaseTest):
self.assertXmlEqual(xml, """
<disk type="network" device="disk">
<driver name="qemu" type="raw"/>
<source name="pool/image" protocol="rbd"/>
<source protocol="rbd" name="pool/image"/>
<auth username="foo">
<secret type="ceph"
uuid="b38a3f43-4be2-4046-897f-b67c2f5e0147"/>
@ -530,7 +530,7 @@ class LibvirtConfigGuestInterfaceTest(LibvirtConfigBaseTest):
<interface type="direct">
<mac address="DE:AD:BE:EF:CA:FE"/>
<model type="virtio"/>
<source dev="eth0" mode="private"/>
<source mode="private" dev="eth0"/>
<virtualport type="802.1Qbh"/>
</interface>""")

2
tools/pip-requires
View File

@ -5,7 +5,7 @@ anyjson==0.2.4
boto==2.1.1
eventlet>=0.9.17
kombu==1.0.4
lxml>=2.3,<3
lxml>=2.3,<=2.3.5
routes==1.12.3
WebOb==1.0.8
greenlet>=0.3.1