commit 6fab1a1540ec9c38413b1a028bb367b849fa4038
author Attila Fazekas <afazekas@redhat.com> Thu Oct 17 17:38:54 2013 +0200
committer Attila Fazekas <afazekas@redhat.com> Thu Oct 17 19:38:14 2013 +0200
tree e4d5289e13456044846b4f5479481b411243188d
parent 8bdb0f7f85dad37a514c9ef80c48e6343eea9d45

server status remained in unexpected state

Two test case in the test_servers_negative change the 'one' servers
into a stable not active state. We are waiting 2 times 400 sec for
getting active state in vain.
Having those test cases to restore the expected state.

The deleted server related rebuild and reboot test case create are
merged and it creates and deletes one server.

Change-Id: Ie1b9dc62bad2bf7b8595da2c9d6f994c646a0025

tempest/api/compute/servers/test_servers_negative.py

diff --git a/tempest/api/compute/servers/test_servers_negative.py b/tempest/api/compute/servers/test_servers_negative.py
index 7062a3b..c57dded 100644
--- a/tempest/api/compute/servers/test_servers_negative.py
+++ b/tempest/api/compute/servers/test_servers_negative.py
@@ -120,31 +120,28 @@
                           nonexistent_server, 'SOFT')
 
     @attr(type=['negative', 'gate'])
-    def test_reboot_deleted_server(self):
-        # Reboot a deleted server
-        self.client.delete_server(self.server_id)
-        self.client.wait_for_server_termination(self.server_id)
-        self.assertRaises(exceptions.NotFound, self.client.reboot,
-                          self.server_id, 'SOFT')
-
-    @attr(type=['negative', 'gate'])
     def test_pause_paused_server(self):
         # Pause a paused server.
         self.client.pause_server(self.server_id)
+        self.addCleanup(self.client.unpause_server,
+                        self.server_id)
         self.client.wait_for_server_status(self.server_id, 'PAUSED')
         self.assertRaises(exceptions.Duplicate,
                           self.client.pause_server,
                           self.server_id)
 
     @attr(type=['negative', 'gate'])
-    def test_rebuild_deleted_server(self):
-        # Rebuild a deleted server
-        self.client.delete_server(self.server_id)
-        self.client.wait_for_server_termination(self.server_id)
+    def test_rebuild_reboot_deleted_server(self):
+        # Rebuild and Reboot a deleted server
+        _, server = self.create_server()
+        self.client.delete_server(server['id'])
+        self.client.wait_for_server_termination(server['id'])
 
         self.assertRaises(exceptions.NotFound,
                           self.client.rebuild,
-                          self.server_id, self.image_ref_alt)
+                          server['id'], self.image_ref_alt)
+        self.assertRaises(exceptions.NotFound, self.client.reboot,
+                          server['id'], 'SOFT')
 
     @attr(type=['negative', 'gate'])
     def test_rebuild_non_existent_server(self):
@@ -332,6 +329,8 @@
     def test_suspend_server_invalid_state(self):
         # suspend a suspended server.
         resp, _ = self.client.suspend_server(self.server_id)
+        self.addCleanup(self.client.resume_server,
+                        self.server_id)
         self.assertEqual(202, resp.status)
         self.client.wait_for_server_status(self.server_id, 'SUSPENDED')
         self.assertRaises(exceptions.Duplicate,