openstack
/
fuel-main
Code Issues Proposed changes

4.1.1 Fix for deploy simple savanna 

Patch includes:

* Add failed test name in run single
ostf test invocation

* Increase timeout to 1200 s for savanna test

* Add timeout parameter to the run single
ostf test method

Change-Id: I8eec30ec12e240331d388ad05a4d866e16aa945c
This commit is contained in:
Tatyana Leontovich 2014-06-06 13:32:54 +00:00
parent 1e0f6790c4
commit 86b014162c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fuelweb_test/models/fuel_web_client.py
View File

@ -479,12 +479,15 @@ class FuelWebClient(object):
@logwrap
def run_single_ostf_test(self, cluster_id,
test_sets=None, test_name=None, should_fail=0,
retries=None):
retries=None, timeout=15 * 60,
failed_test_name=None):
self.client.ostf_run_singe_test(cluster_id, test_sets, test_name)
if retries:
return self.return_ostf_results(cluster_id, timeout=15 * 60)
return self.return_ostf_results(cluster_id, timeout=timeout)
else:
self.assert_ostf_run(cluster_id, should_fail=should_fail)
self.assert_ostf_run(cluster_id, should_fail=should_fail,
timeout=timeout,
failed_test_name=failed_test_name)
@logwrap
def task_wait(self, task, timeout, interval=5):

6
fuelweb_test/tests/test_services.py
View File

@ -110,11 +110,15 @@ class SavannaSimple(TestBasic):
LOGGER.debug('Run OSTF savanna platform tests')
failed_test_name = ['Create volume and attach it to instance']
self.fuel_web.run_single_ostf_test(
cluster_id=cluster_id, test_sets=['platform_tests'],
test_name=('fuel_health.tests.platform_tests.'
'test_platform_savanna.PlatformSavannaTests.'
'test_platform_savanna'), should_fail=1)
'test_platform_savanna'), should_fail=1,
timeout=60 * 200,
failed_test_name=failed_test_name)
self.env.make_snapshot("deploy_savanna_simple")