Merge lp://qastaging/~rackspace-titan/nova/fix_libvirt_snapshot_tests into lp://qastaging/~hudson-openstack/nova/trunk

Proposed by Dan Prince
Status: Merged
Approved by: Vish Ishaya
Approved revision: 1579
Merged at revision: 1580
Proposed branch: lp://qastaging/~rackspace-titan/nova/fix_libvirt_snapshot_tests
Merge into: lp://qastaging/~hudson-openstack/nova/trunk
Diff against target: 28 lines (+10/-1)
1 file modified
nova/tests/test_libvirt.py (+10/-1)
To merge this branch: bzr merge lp://qastaging/~rackspace-titan/nova/fix_libvirt_snapshot_tests
Reviewer Review Type Date Requested Status
Vish Ishaya (community) Approve
Soren Hansen (community) Approve
Review via email: mp+75735@code.qastaging.launchpad.net

Description of the change

Add a FakeVirDomainSnapshot and return it from snapshotCreateXML.
Fixes libvirt snapshot tests.

To post a comment you must log in.
Revision history for this message
Dan Prince (dan-prince) wrote :

Note to Soren:

I tried using your lp:~soren/nova/virt-test-improvements as a possible solution to this but I got 4 or 5 tests failing when merging with trunk. Not trying to give you conflicts in libvirt test land but I would like these to pass today!

If you get those working today however and resolve this issue I can un-merge-prop this branch.

Revision history for this message
Soren Hansen (soren) wrote :

lgtm

review: Approve
Revision history for this message
Vish Ishaya (vishvananda) wrote :

lgtm2

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.