diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-13 02:10:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-13 02:10:40 +0000 |
| commit | b99b8b9c0bbdfb7e905d8e0bc2f43d5080293859 (patch) | |
| tree | e7ba15b9d06f4b4e206986c6bb21cdf82ee6fc88 | |
| parent | 900a0230ff1e29634a5ecb85dbe1159a95216d31 (diff) | |
| parent | 4599261d632ad806537fbf4a3b15ef82d2b5192b (diff) | |
Merge "More specific lxml versions in tools/pip-requires"
| -rw-r--r-- | nova/tests/test_libvirt_config.py | 6 | ||||
| -rw-r--r-- | tools/pip-requires | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/tests/test_libvirt_config.py b/nova/tests/test_libvirt_config.py index b0da9f998..a00d5b572 100644 --- a/nova/tests/test_libvirt_config.py +++ b/nova/tests/test_libvirt_config.py @@ -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>""") diff --git a/tools/pip-requires b/tools/pip-requires index 0688522cd..0c80a43d6 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -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 |