summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorin Hochstein <lorin@isi.edu>2011-06-13 16:41:31 -0400
committerLorin Hochstein <lorin@isi.edu>2011-06-13 16:41:31 -0400
commit2f422747cc7ffcbbe952e9a3fb5fd1de6a417901 (patch)
tree4c251708a039630087b06daeb140278f18de15e8
parent9eb2b52946be78428f6ee565f8b29e6ee9102a8c (diff)
downloadnova-2f422747cc7ffcbbe952e9a3fb5fd1de6a417901.tar.gz
nova-2f422747cc7ffcbbe952e9a3fb5fd1de6a417901.tar.xz
nova-2f422747cc7ffcbbe952e9a3fb5fd1de6a417901.zip
Test now passes even if the rpc call does not complete on time
-rw-r--r--nova/tests/test_cloud.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py
index 13046f861..b491448eb 100644
--- a/nova/tests/test_cloud.py
+++ b/nova/tests/test_cloud.py
@@ -466,7 +466,8 @@ class CloudTestCase(test.TestCase):
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.assertTrue(instance['instanceState']['name'] in
+ ['networking', 'scheduling'])
self.assertEqual(instance['instanceType'], 'm1.small')
def test_run_instances_image_state_none(self):