summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-08-26 06:47:17 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-26 06:47:17 +0000
commit2b22d89b5a3dc212774d0a426e53d569f98173a7 (patch)
tree7b5bb2dd1ef752f18ba39912f493f5d31f9088b7 /ci
parent32f9e76a947391a35a781fb8ecad1c428c582626 (diff)
parentd6484df9b602f0888450ef1e29ccc0a5f6c94675 (diff)
Merge "Stop calling exec_test.sh in the middle of python scripts"
Diffstat (limited to 'ci')
-rwxr-xr-xci/run_tests.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/ci/run_tests.py b/ci/run_tests.py
index 982567217..17481780e 100755
--- a/ci/run_tests.py
+++ b/ci/run_tests.py
@@ -13,8 +13,10 @@ import datetime
import os
import re
import sys
+
import functest.ci.generate_report as generate_report
import functest.ci.tier_builder as tb
+from functest.testcases.Controllers.ODL.OpenDaylightTesting import ODLTestCases
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
import functest.utils.openstack_clean as os_clean
@@ -100,9 +102,15 @@ def run_test(test, tier_name):
if REPORT_FLAG:
flags += " -r"
- cmd = ("%s%s" % (EXEC_SCRIPT, flags))
- logger.debug("Executing command '%s'" % cmd)
- result = ft_utils.execute_command(cmd, exit_on_error=False)
+ if test_name == 'odl':
+ result = ODLTestCases.functest_run()
+ if result and REPORT_FLAG:
+ result = ODLTestCases.push_to_db()
+ result = not result
+ else:
+ cmd = ("%s%s" % (EXEC_SCRIPT, flags))
+ logger.debug("Executing command '%s'" % cmd)
+ result = ft_utils.execute_command(cmd, exit_on_error=False)
if CLEAN_FLAG:
cleanup()