Merge lp:~soren/nova/fix-unit-tests into lp:~hudson-openstack/nova/trunk
Proposed by
Soren Hansen
Status: | Merged |
---|---|
Approved by: | Eric Day |
Approved revision: | 315 |
Merged at revision: | 356 |
Proposed branch: | lp:~soren/nova/fix-unit-tests |
Merge into: | lp:~hudson-openstack/nova/trunk |
Diff against target: |
44 lines (+5/-3) 2 files modified
bin/nova-dhcpbridge (+1/-3) nova/tests/cloud_unittest.py (+4/-0) |
To merge this branch: | bzr merge lp:~soren/nova/fix-unit-tests |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Eric Day (community) | Approve | ||
Jay Pipes (community) | Approve | ||
Review via email: mp+38587@code.launchpad.net |
Description of the change
Fix some unit tests:
* One is a race due to the polling nature of rpc in eventlet based unit tests.
* The other is a more real problem. It was caused by datastore.py being removed. It wasn't caught earlier because the .pyc file was still around on the tarmac box.
To post a comment you must log in.
nice catches.