OpenStack Compute (nova)

Merge lp:~xtoddx/nova/lp695182 into lp:~hudson-openstack/nova/trunk

  1. lp695182
  2. Merge into trunk
Proposed by Todd Willey
Status: Merged
Approved by: Cory Wright
Approved revision: 504
Merged at revision: 504
Proposed branch: lp:~xtoddx/nova/lp695182
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 11 lines (+1/-0)
1 file modified
nova/tests/test_scheduler.py (+1/-0)
To merge this branch: bzr merge lp:~xtoddx/nova/lp695182
Reviewer Review Type Date Requested Status
Cory Wright (community) Approve
Vish Ishaya (community) Approve
Review via email: mp+44876@code.launchpad.net

Description of the change

fix lp:695182, scheduler tests needed to DECLARE flag to run standalone.

To post a comment you must log in.
Revision history for this message
Vish Ishaya (vishvananda) wrote :

lgtm

review: Approve
Revision history for this message
Cory Wright (corywright) wrote :

simple enough, lgtm.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/tests/test_scheduler.py'
2--- nova/tests/test_scheduler.py 2010-12-23 18:31:46 +0000
3+++ nova/tests/test_scheduler.py 2010-12-29 22:04:57 +0000
4@@ -33,6 +33,7 @@
5
6 FLAGS = flags.FLAGS
7 flags.DECLARE('max_cores', 'nova.scheduler.simple')
8+flags.DECLARE('stub_network', 'nova.compute.manager')
9
10
11 class TestDriver(driver.Scheduler):