From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 18 Jun 2013 23:22:17 +0000 (+0000)
Subject: Merge "Support cloud-specific suffixes to server status."
X-Git-Tag: 2014.1~465
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2d673e51473ab9b0771cadb5099ab92a7f8b20ba;p=openstack-build%2Fheat-build.git

Merge "Support cloud-specific suffixes to server status."
---

2d673e51473ab9b0771cadb5099ab92a7f8b20ba
diff --cc heat/tests/test_instance.py
index 937e534a,17346cba..457ef850
--- a/heat/tests/test_instance.py
+++ b/heat/tests/test_instance.py
@@@ -286,8 -285,11 +286,11 @@@ class instancesTest(HeatTestCase)
          self.m.ReplayAll()
  
          scheduler.TaskRunner(instance.create)()
 -        self.assertEqual(instance.state, instance.CREATE_COMPLETE)
 +        self.assertEqual(instance.state, (instance.CREATE, instance.COMPLETE))
  
+     def test_instance_status_build_spawning(self):
+         self._test_instance_status_not_build_active('BUILD(SPAWNING)')
+ 
      def test_instance_status_hard_reboot(self):
          self._test_instance_status_not_build_active('HARD_REBOOT')