diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-11-25 07:04:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-25 07:04:56 +0000 |
| commit | e2de95f657cdeabd5c6aa4decaaee39e69f0ca32 (patch) | |
| tree | d998a2ecf553b96f2d51d10ae89eceae7a9ca2b9 | |
| parent | 428bc342e7e4d6cb1c6123c3b611b78b9fea068d (diff) | |
| parent | b3c31aac45338837d9392ef69ffa76029dd1db88 (diff) | |
Merge "Consider criteria as exit condition in odl test"
| -rwxr-xr-x | functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py | 5 | ||||
| -rw-r--r-- | functest/tests/unit/odl/test_odl.py | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py b/functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py index 0ddb58cd..b78db8b1 100755 --- a/functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py +++ b/functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py @@ -89,6 +89,7 @@ class ODLTestCases(TestCasesBase.TestCasesBase): self.details = {} self.details['description'] = result.suite.name self.details['tests'] = visitor.get_data() + return self.criteria def main(self, **kwargs): dirs = [self.basic_suite_dir, self.neutron_suite_dir] @@ -127,8 +128,10 @@ class ODLTestCases(TestCasesBase.TestCasesBase): self.logger.info("\n" + stdout.read()) self.logger.info("ODL results were successfully generated") try: - self.parse_results() + test_res = self.parse_results() self.logger.info("ODL results were successfully parsed") + if test_res is not "PASS": + return self.EX_RUN_ERROR except RobotError as e: self.logger.error("Run tests before publishing: %s" % e.message) diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py index 065298d6..fdd45763 100644 --- a/functest/tests/unit/odl/test_odl.py +++ b/functest/tests/unit/odl/test_odl.py @@ -200,7 +200,8 @@ class ODLTestCasesTesting(unittest.TestCase): def test_main(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=True), \ - mock.patch.object(self.test, 'parse_results'): + mock.patch.object(self.test, 'parse_results', + return_value="PASS"): self._test_main(TestCasesBase.TestCasesBase.EX_OK, *args) @mock.patch('os.remove') @@ -209,7 +210,8 @@ class ODLTestCasesTesting(unittest.TestCase): def test_main_makedirs_oserror17(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=True), \ - mock.patch.object(self.test, 'parse_results'): + mock.patch.object(self.test, 'parse_results', + return_value="PASS"): self._test_main(TestCasesBase.TestCasesBase.EX_OK, *args) @mock.patch('os.remove') @@ -218,7 +220,8 @@ class ODLTestCasesTesting(unittest.TestCase): def test_main_testcases_in_failure(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=True), \ - mock.patch.object(self.test, 'parse_results'): + mock.patch.object(self.test, 'parse_results', + return_value="PASS"): self._test_main(TestCasesBase.TestCasesBase.EX_OK, *args) @mock.patch('os.remove', side_effect=OSError) @@ -227,7 +230,8 @@ class ODLTestCasesTesting(unittest.TestCase): def test_main_remove_oserror(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=True), \ - mock.patch.object(self.test, 'parse_results'): + mock.patch.object(self.test, 'parse_results', + return_value="PASS"): self._test_main(TestCasesBase.TestCasesBase.EX_OK, *args) def _test_run_missing_env_var(self, var): |