From ecba2a85af3511619d4a963af411134d7b8f3d74 Mon Sep 17 00:00:00 2001 From: Masahito Muroi Date: Mon, 5 Jun 2017 23:36:16 +0900 Subject: [PATCH] Revert "Fix gate issue in scenario test" This reverts commit 124ac0557a95ab092db549b6de8adcbe2cd80315. The root cause of the gate issue is fixed in Nova I142f97d691fa55e9824714c9c224f998ad72337e. Change-Id: I50081d615b1d47215e1e35e62ac2cb14fb1c63ad --- .../tempest/scenario/test_host_reservation.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/contrib/tempest/tempest/scenario/test_host_reservation.py b/contrib/tempest/tempest/scenario/test_host_reservation.py index e6af9dcc..308c2d97 100644 --- a/contrib/tempest/tempest/scenario/test_host_reservation.py +++ b/contrib/tempest/tempest/scenario/test_host_reservation.py @@ -130,17 +130,6 @@ class TestHostReservationScenario(rrs.ResourceReservationScenarioTest): server = self.create_server(clients=self.admin_manager, wait_until=None, **create_kwargs) - - # TODO(masahito) the try-except statement is a quick fix for nova's bug - # https://bugs.launchpad.net/nova/+bug/1693438. After fixing the bug - # remove the try-except. extra_timeout argument is added for ensuring - # the server remains in BUILD status longer than instance boots time. - try: - waiters.wait_for_server_status(self.admin_manager.servers_client, - server['id'], 'ERROR', - raise_on_error=False, - extra_timeout=100) - except exceptions.TimeoutException: - # check the server's status remains in BUILD status - waiters.wait_for_server_status(self.admin_manager.servers_client, - server['id'], 'BUILD') + waiters.wait_for_server_status(self.admin_manager.servers_client, + server['id'], 'ERROR', + raise_on_error=False)