Fix for bug 918502

The previous fix for this did not take, this change has a test and
should once and for all solve this issue.

Change-Id: Ieb4def28dce4f1f993a2af87425bd280185456ab

1 files changed, 16 insertions, 0 deletions

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 17cf46ceb..77daa4564 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -520,6 +520,22 @@ class ComputeTestCase(BaseTestCase):
 
         self.compute.terminate_instance(self.context, inst_ref['uuid'])
 
+    def test_set_admin_password_bad_state(self):
+        """Test setting password while instance is rebuilding."""
+        instance = self._create_fake_instance()
+        self.compute.run_instance(self.context, instance['uuid'])
+        db.instance_update(self.context, instance['uuid'], {
+            "power_state": power_state.NOSTATE,
+        })
+        instance = db.instance_get_by_uuid(self.context, instance['uuid'])
+
+        self.assertEqual(instance['power_state'], power_state.NOSTATE)
+        self.assertRaises(exception.Error,
+                          self.compute.set_admin_password,
+                          self.context,
+                          instance['uuid'])
+        self.compute.terminate_instance(self.context, instance['uuid'])
+
     def test_set_admin_password_driver_error(self):
         """Ensure error is raised admin password set"""