aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-11-25 07:04:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-25 07:04:56 +0000
commite2de95f657cdeabd5c6aa4decaaee39e69f0ca32 (patch)
treed998a2ecf553b96f2d51d10ae89eceae7a9ca2b9 /functest/opnfv_tests
parent428bc342e7e4d6cb1c6123c3b611b78b9fea068d (diff)
parentb3c31aac45338837d9392ef69ffa76029dd1db88 (diff)
Merge "Consider criteria as exit condition in odl test"
Diffstat (limited to 'functest/opnfv_tests')
-rwxr-xr-xfunctest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py5
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 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)