openstack
/
fuel-ostf
Code Issues Proposed changes

Merge "[Murano] Multiple fixes for murano OSTF tests"

This commit is contained in:
Jenkins 2016-09-21 11:19:15 +00:00 committed by Gerrit Code Review
parent 53d55f223c e58e5a9bd5
commit c07bd76eac
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuel_health/muranomanager.py
View File

@ -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.

4
fuel_health/tests/tests_platform/test_murano_linux.py
View File

@ -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)