diff options
author | 2016-11-24 15:58:12 +0100 | |
---|---|---|
committer | 2016-11-24 15:58:12 +0100 | |
commit | b3c31aac45338837d9392ef69ffa76029dd1db88 (patch) | |
tree | 059d3aa9719a803f0aef9afadd9ffa47b67baa57 /functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py | |
parent | 7a776398ef8b17bd9af5367d712707a903c1c86a (diff) |
Consider criteria as exit condition in odl test
JIRA: FUNCTEST-621
Change-Id: Ic9dd73861d84e3dbfb3e6611ffc9e5e2c09fcaed
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
Diffstat (limited to 'functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py')
-rwxr-xr-x | functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py b/functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py index 8c003abf..b755c402 100755 --- a/functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py +++ b/functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py @@ -83,6 +83,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] @@ -120,8 +121,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) |