diff options
| author | Andrew Laski <andrew.laski@rackspace.com> | 2012-09-10 18:58:26 -0400 |
|---|---|---|
| committer | Andrew Laski <andrew.laski@rackspace.com> | 2012-09-10 18:58:26 -0400 |
| commit | 4599261d632ad806537fbf4a3b15ef82d2b5192b (patch) | |
| tree | 2e4c54ff871baa7d641b21ea1e9a4259af70d8f7 | |
| parent | 3a671cd7dee8f084d72f8fad9897e46225be7069 (diff) | |
More specific lxml versions in tools/pip-requires
Changed lxml version in tools/pip-requires from >=2.3,<3 to
>=2.3,<2.3.5. pip was apparently accepting 3.0alpha as a <3 requirement
but the ordering of elements changes in that version. Some of the
libvirt tests would pass with lxml 3.0alpha but fail with any 2.3.x
version. The tests now pass with any version of lxml within the range
specified.
Change-Id: I2d84d32f1bf6fba2c6dbe05799a284a44d4c39d8
| -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 |