Avoid server_check_teardown exception breaking tearDown

server_check_teardown will raise Exception which will prevent
other cleanup steps from being executed(i.e., those added with
addCleanup), so server_check_teardown should be called after
super's tearDown.

Change-Id: I1060e2ccdb1ef8ae1e8f1f682fc5d115d129c3ca

tempest/api/compute/images/test_images_oneserver_negative.py

@@ -33,8 +33,11 @@ class ImagesOneServerNegativeTestJSON(base.BaseV2ComputeTest):
 
     def tearDown(self):
         """Terminate test instances created after a test is executed."""
-        self.server_check_teardown()
         super(ImagesOneServerNegativeTestJSON, self).tearDown()
+        # NOTE(zhufl): Because server_check_teardown will raise Exception
+        # which will prevent other cleanup steps from being executed, so
+        # server_check_teardown should be called after super's tearDown.
+        self.server_check_teardown()
 
     def setUp(self):
         # NOTE(afazekas): Normally we use the same server with all test cases,

tempest/api/compute/servers/test_novnc.py

@@ -44,10 +44,13 @@ class NoVNCConsoleTestJSON(base.BaseV2ComputeTest):
         self._websocket = None
 
     def tearDown(self):
-        self.server_check_teardown()
         super(NoVNCConsoleTestJSON, self).tearDown()
         if self._websocket is not None:
             self._websocket.close()
+        # NOTE(zhufl): Because server_check_teardown will raise Exception
+        # which will prevent other cleanup steps from being executed, so
+        # server_check_teardown should be called after super's tearDown.
+        self.server_check_teardown()
 
     @classmethod
     def setup_clients(cls):

tempest/api/compute/servers/test_server_actions.py

@@ -59,8 +59,11 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
                 self.server_id, validatable=True)
 
     def tearDown(self):
-        self.server_check_teardown()
         super(ServerActionsTestJSON, self).tearDown()
+        # NOTE(zhufl): Because server_check_teardown will raise Exception
+        # which will prevent other cleanup steps from being executed, so
+        # server_check_teardown should be called after super's tearDown.
+        self.server_check_teardown()
 
     @classmethod
     def setup_credentials(cls):

tempest/api/compute/servers/test_servers_negative.py

@@ -40,8 +40,11 @@ class ServersNegativeTestJSON(base.BaseV2ComputeTest):
             self.__class__.server_id = self.recreate_server(self.server_id)
 
     def tearDown(self):
-        self.server_check_teardown()
         super(ServersNegativeTestJSON, self).tearDown()
+        # NOTE(zhufl): Because server_check_teardown will raise Exception
+        # which will prevent other cleanup steps from being executed, so
+        # server_check_teardown should be called after super's tearDown.
+        self.server_check_teardown()
 
     @classmethod
     def setup_clients(cls):