diff options
author | 2017-09-19 07:10:53 +0000 | |
---|---|---|
committer | 2017-09-19 07:10:53 +0000 | |
commit | 6c9b7cee6284ca187565989120b2b9829a30a9a4 (patch) | |
tree | 97c06c081c0cb00abf342cae191ec1184873dd1f /functest/ci | |
parent | 995786148843e5a52c2ebbc4defd78dea523fe59 (diff) | |
parent | 516d1bd7811f5751d796748ddd52f798bbd5a40f (diff) |
Merge "Return Functest status to Jenkins"
Diffstat (limited to 'functest/ci')
-rw-r--r-- | functest/ci/run_tests.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py index a129ea73..d4acd9c5 100644 --- a/functest/ci/run_tests.py +++ b/functest/ci/run_tests.py @@ -124,16 +124,18 @@ class Runner(object): self.executed_test_cases[test.get_name()] = test_case if self.clean_flag: if test_case.create_snapshot() != test_case.EX_OK: - return result + return testcase.TestCase.EX_RUN_ERROR try: kwargs = run_dict['args'] - result = test_case.run(**kwargs) + test_case.run(**kwargs) except KeyError: - result = test_case.run() - if result == testcase.TestCase.EX_OK: - if self.report_flag: - test_case.push_to_db() + test_case.run() + if self.report_flag: + test_case.push_to_db() + if test.get_project() == "functest": result = test_case.is_successful() + else: + result = testcase.TestCase.EX_OK logger.info("Test result:\n\n%s\n", test_case) if self.clean_flag: test_case.clean() @@ -157,10 +159,12 @@ class Runner(object): else: logger.info("Running tier '%s'" % tier_name) for test in tests: - result = self.run_test(test) - if result != testcase.TestCase.EX_OK: + self.run_test(test) + test_case = self.executed_test_cases[test.get_name()] + if test_case.is_successful() != testcase.TestCase.EX_OK: logger.error("The test case '%s' failed.", test.get_name()) - self.overall_result = Result.EX_ERROR + if test.get_project() == "functest": + self.overall_result = Result.EX_ERROR if test.is_blocking(): raise BlockingTestFailed( "The test case {} failed and is blocking".format( |