summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dovetail/compliance/proposed_tests.yml24
-rw-r--r--dovetail/report.py20
-rwxr-xr-xdovetail/run.py4
-rw-r--r--dovetail/testcase/defcore.tc002.yml2
4 files changed, 27 insertions, 23 deletions
diff --git a/dovetail/compliance/proposed_tests.yml b/dovetail/compliance/proposed_tests.yml
index bc785206..de5715ff 100644
--- a/dovetail/compliance/proposed_tests.yml
+++ b/dovetail/compliance/proposed_tests.yml
@@ -35,15 +35,15 @@ proposed_tests:
- dovetail.nfvi.tc001
- dovetail.nfvi.tc002
# HA
- - dovetail.ha.tc001
- - dovetail.ha.tc002
- - dovetail.ha.tc003
- - dovetail.ha.tc004
- - dovetail.ha.tc005
- - dovetail.ha.tc006
- - dovetail.ha.tc007
- - dovetail.ha.tc008
- - dovetail.ha.tc009
- - dovetail.ha.tc010
- - dovetail.ha.tc011
- - dovetail.ha.tc012
+ # - dovetail.ha.tc001
+ # - dovetail.ha.tc002
+ # - dovetail.ha.tc003
+ # - dovetail.ha.tc004
+ # - dovetail.ha.tc005
+ # - dovetail.ha.tc006
+ # - dovetail.ha.tc007
+ # - dovetail.ha.tc008
+ # - dovetail.ha.tc009
+ # - dovetail.ha.tc010
+ # - dovetail.ha.tc011
+ # - dovetail.ha.tc012
diff --git a/dovetail/report.py b/dovetail/report.py
index c51ce687..2c6200d3 100644
--- a/dovetail/report.py
+++ b/dovetail/report.py
@@ -416,16 +416,20 @@ class FunctestChecker(object):
testcase_passed = 'SKIP'
for sub_testcase in sub_testcase_list:
self.logger.debug('check sub_testcase:%s', sub_testcase)
- if self.get_sub_testcase(sub_testcase,
- db_result['details']['errors']):
+ try:
+ if self.get_sub_testcase(sub_testcase,
+ db_result['details']['errors']):
+ testcase.sub_testcase_passed(sub_testcase, 'FAIL')
+ testcase_passed = 'FAIL'
+ continue
+ if self.get_sub_testcase(sub_testcase,
+ db_result['details']['skipped']):
+ testcase.sub_testcase_passed(sub_testcase, 'SKIP')
+ else:
+ testcase.sub_testcase_passed(sub_testcase, 'PASS')
+ except KeyError:
testcase.sub_testcase_passed(sub_testcase, 'FAIL')
testcase_passed = 'FAIL'
- continue
- if self.get_sub_testcase(sub_testcase,
- db_result['details']['skipped']):
- testcase.sub_testcase_passed(sub_testcase, 'SKIP')
- else:
- testcase.sub_testcase_passed(sub_testcase, 'PASS')
if testcase_passed == 'SKIP':
for sub_testcase in sub_testcase_list:
diff --git a/dovetail/run.py b/dovetail/run.py
index f268f921..607e1b15 100755
--- a/dovetail/run.py
+++ b/dovetail/run.py
@@ -54,8 +54,8 @@ def run_test(testsuite, testarea, logger):
continue
run_testcase = True
- if testcase.exceed_max_retry_times():
- run_testcase = False
+ # if testcase.exceed_max_retry_times():
+ # run_testcase = False
# if testcase.script_result_acquired():
# run_testcase = False
diff --git a/dovetail/testcase/defcore.tc002.yml b/dovetail/testcase/defcore.tc002.yml
index a8fc3d95..ae7a1fb3 100644
--- a/dovetail/testcase/defcore.tc002.yml
+++ b/dovetail/testcase/defcore.tc002.yml
@@ -11,7 +11,7 @@ dovetail.defcore.tc002:
pre_condition:
- 'echo test for precondition in testcase'
cmds:
- - 'cd /home/opnfv/repos/refstack-client; source .venv/bin/activate; ./refstack-client test -c /home/opnfv/userconfig/tempest.conf -v --test-list /home/opnfv/userconfig/defcore.txt'
+ - 'cd /home/opnfv/repos/refstack-client; source .venv/bin/activate; ./refstack-client test -c /home/opnfv/userconfig/refstack_tempest.conf -v --test-list /home/opnfv/userconfig/defcore.txt'
post_condition:
- 'echo test for postcondition in testcase'
report: