Merge lp:~usc-isi/nova/lp796820 into lp:~hudson-openstack/nova/trunk

[Lorin Hochstein]

Fixes a bug where a unit test sometimes fails due to a race condition.

[Ed Leafe (ed-leafe)]

Would it be better to stub out the rpc call? Unit tests shouldn't be dependent on externals like this.

[Trey Morris (tr3buchet)]

sneaky good fix, but I agree with ed: that call should be stubbed out.

review: Needs Fixing

[Lorin Hochstein (lorinh)]

I'll stub it out and re-submit the merge prop.

[Brian Waldon (bcwaldon)]

Setting to WIP for now. Lorin, you can set back to Needs Review when you're ready.

[Lorin Hochstein (lorinh)]

It's ready now.

[Brian Waldon (bcwaldon)]

Good work.

review: Approve

[Mark Washenberger (markwash)]

Looks good. Thanks!

review: Approve

=== modified file 'nova/tests/test_cloud.py'
--- nova/tests/test_cloud.py	2011-06-10 18:10:58 +0000
+++ nova/tests/test_cloud.py	2011-06-14 17:23:59 +0000
@@ -457,6 +457,12 @@
         self.cloud.delete_key_pair(self.context, 'test')
 
     def test_run_instances(self):
+        # stub out the rpc call
+        def stub_cast(*args, **kwargs):
+            pass
+
+        self.stubs.Set(rpc, 'cast', stub_cast)
+
         kwargs = {'image_id': FLAGS.default_image,
                   'instance_type': FLAGS.default_instance_type,
                   'max_count': 1}
@@ -466,7 +472,7 @@
         self.assertEqual(instance['imageId'], 'ami-00000001')
         self.assertEqual(instance['displayName'], 'Server 1')
         self.assertEqual(instance['instanceId'], 'i-00000001')
-        self.assertEqual(instance['instanceState']['name'], 'networking')
+        self.assertEqual(instance['instanceState']['name'], 'scheduling')
         self.assertEqual(instance['instanceType'], 'm1.small')
 
     def test_run_instances_image_state_none(self):