From: Cédric Ollivier Date: Wed, 11 Jul 2018 12:58:36 +0000 (+0200) Subject: Force result = 0 if exception X-Git-Tag: opnfv-7.0.0~209 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F59683%2F1;p=functest.git Force result = 0 if exception self.result can be positive due to intermediary steps (scenarios). Else it can return false positives [1]. [1] https://build.opnfv.org/ci/view/functest/job/functest-apex-virtual-suite-master/113/console Change-Id: Iecadee7f7380fda5273a0668aff1b441647c45aa Signed-off-by: Cédric Ollivier --- diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index 872e75b8e..e193b83ef 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -502,6 +502,7 @@ class RallyBase(singlevm.VmReady1): res = testcase.TestCase.EX_OK except Exception as exc: # pylint: disable=broad-except LOGGER.error('Error with run: %s', exc) + self.result = 0 res = testcase.TestCase.EX_RUN_ERROR self.stop_time = time.time() return res diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 9e200bbd6..ea82d2307 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -297,6 +297,7 @@ class TempestCommon(singlevm.VmReady1): res = testcase.TestCase.EX_OK except Exception: # pylint: disable=broad-except LOGGER.exception('Error with run') + self.result = 0 res = testcase.TestCase.EX_RUN_ERROR self.stop_time = time.time() return res