From e58e5a9bd5f4b8a257dd1251bdd98b19f9c6df1f Mon Sep 17 00:00:00 2001 From: Victor Ryzhenkin Date: Tue, 20 Sep 2016 20:16:44 +0300 Subject: [PATCH] [Murano] Multiple fixes for murano OSTF tests - Reduce time between environment deletion checks - Increase timeout for environment removal verification Change-Id: Iad6e9c5f2e976c9130682e705b4d609393eccd92 Closes-Bug: #1625727 --- fuel_health/muranomanager.py | 4 ++-- fuel_health/tests/tests_platform/test_murano_linux.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fuel_health/muranomanager.py b/fuel_health/muranomanager.py index 5f1f04da..e5f49b26 100644 --- a/fuel_health/muranomanager.py +++ b/fuel_health/muranomanager.py @@ -184,7 +184,7 @@ class MuranoTest(fuel_health.nmanager.PlatformServicesBaseClass): self.murano_client.environments.delete(environment_id) return self.environments.remove(environment_id) - def environment_delete_check(self, environment_id, timeout=60): + def environment_delete_check(self, environment_id, timeout=120): resp = requests.get('{0}environments/{1}'.format(self.endpoint, environment_id), headers=self.headers, verify=False) @@ -204,7 +204,7 @@ class MuranoTest(fuel_health.nmanager.PlatformServicesBaseClass): except Exception: LOG.debug("Failed to get environment status " "or environment no more exists") - time.sleep(5) + time.sleep(1) def create_session(self, environment_id): """This method allows to create session for environment. diff --git a/fuel_health/tests/tests_platform/test_murano_linux.py b/fuel_health/tests/tests_platform/test_murano_linux.py index 3bfe06b6..62ec7702 100644 --- a/fuel_health/tests/tests_platform/test_murano_linux.py +++ b/fuel_health/tests/tests_platform/test_murano_linux.py @@ -155,7 +155,7 @@ class MuranoDeployLinuxServicesTests(muranomanager.MuranoTest): self.environment.id) fail_msg = "Can't delete environment. " - self.verify(60, self.environment_delete_check, + self.verify(180, self.environment_delete_check, 9, fail_msg, "deleting environment", self.environment.id) @@ -265,7 +265,7 @@ class MuranoDeployLinuxServicesTests(muranomanager.MuranoTest): self.environment.id) fail_msg = "Can't delete environment. " - self.verify(60, self.environment_delete_check, + self.verify(180, self.environment_delete_check, 9, fail_msg, "deleting environment", self.environment.id)