diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-12-02 07:21:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-02 07:21:01 +0000 |
| commit | 174e2273fab05ecf480201b33fd109003573ac0b (patch) | |
| tree | 685776e7bee0f4cc0cc3fe1b6b0816bf09228237 | |
| parent | 8417877de20766eb9695382e708efeb8de32cab6 (diff) | |
| parent | b7b59a2360ad2ac1994b4f4ddc2a3817ca2a395d (diff) | |
Merge "Revert "solve failure testcases are not pushed to testDB problem""
| -rw-r--r-- | functest/ci/run_tests.py | 7 | ||||
| -rw-r--r-- | functest/core/TestCasesBase.py | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py index da9d28a9..66d5881d 100644 --- a/functest/ci/run_tests.py +++ b/functest/ci/run_tests.py @@ -140,10 +140,9 @@ def run_test(test, tier_name): cls = getattr(module, run_dict['class']) test_case = cls() result = test_case.run() - - if result != TestCasesBase.TestCasesBase.EX_SKIP and \ - GlobalVariables.REPORT_FLAG: - test_case.push_to_db() + if (result == TestCasesBase.TestCasesBase.EX_OK and + GlobalVariables.REPORT_FLAG): + result = test_case.push_to_db() except ImportError: logger.exception("Cannot import module {}".format( run_dict['module'])) diff --git a/functest/core/TestCasesBase.py b/functest/core/TestCasesBase.py index e1c002d4..ac201071 100644 --- a/functest/core/TestCasesBase.py +++ b/functest/core/TestCasesBase.py @@ -19,7 +19,6 @@ class TestCasesBase(object): EX_OK = os.EX_OK EX_RUN_ERROR = os.EX_SOFTWARE EX_PUSH_TO_DB_ERROR = os.EX_SOFTWARE - 1 - EX_SKIP = os.EX_SOFTWARE - 2 logger = ft_logger.Logger(__name__).getLogger() |