diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-20 20:59:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-20 20:59:46 +0000 |
| commit | 143bd3adc274b4087fab5a3d003e662a09e52e2d (patch) | |
| tree | d1da58ef775eb1273d16d3177719903a00658fd5 | |
| parent | def5fa1e0e1c0426d973e4d8e3935c6eb18698dc (diff) | |
| parent | dbbbbf4ecb2c7b03ebb30fa11e077d35b2186cbb (diff) | |
| download | nova-143bd3adc274b4087fab5a3d003e662a09e52e2d.tar.gz nova-143bd3adc274b4087fab5a3d003e662a09e52e2d.tar.xz nova-143bd3adc274b4087fab5a3d003e662a09e52e2d.zip | |
Merge "Enable tox use of site-packages for libvirt."
| -rw-r--r-- | nova/tests/test_libvirt.py | 7 | ||||
| -rw-r--r-- | tox.ini | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index fa691c2e1..e56a50ffb 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -291,6 +291,13 @@ class LibvirtConnTestCase(test.TestCase): self.useFixture(fixtures.MonkeyPatch( 'nova.virt.libvirt.driver.libvirt_utils', fake_libvirt_utils)) + # Force libvirt to return a host UUID that matches the serial in + # nova.tests.fakelibvirt. This is necessary because the host UUID + # returned by libvirt becomes the serial whose value is checked for in + # test_xml_and_uri_* below. + self.useFixture(fixtures.MonkeyPatch( + 'nova.virt.libvirt.driver.LibvirtDriver.get_host_uuid', + lambda _: 'cef19ce0-0ca2-11df-855d-b19fbce37686')) self.useFixture(fixtures.MonkeyPatch( 'nova.virt.libvirt.imagebackend.libvirt_utils', fake_libvirt_utils)) @@ -2,6 +2,7 @@ envlist = py26,py27,pep8 [testenv] +sitepackages = True setenv = VIRTUAL_ENV={envdir} LANG=en_US.UTF-8 LANGUAGE=en_US:en |