dovetail tool: report.py bugfix and tempest skipped testcase added

JIRA: DOVETAIL-343

1, bugfix
https://build.opnfv.org/ci/view/dovetail/job/dovetail-compass-virtual-debug-master/lastSuccessfulBuild/artifact/results/dovetail_report.txt
test result error
2, skipped testcase in tempest added
3, two testcase in tempest full testsuite added in debug.yml to debug

Change-Id: I6bf371d3384e3755d6a41d951cfc9d1a55e00ab3
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>

diff --git a/dovetail/compliance/debug.yml b/dovetail/compliance/debug.yml
index bbcccd7..87003c4 100644 (file)
--- a/dovetail/compliance/debug.yml
+++ b/dovetail/compliance/debug.yml
@@ -8,6 +8,8 @@ debug:
     - dovetail.example.tc002
     - dovetail.ipv6.tc008
     - dovetail.ipv6.tc009
+    - dovetail.ipv6.tc018
+    - dovetail.ipv6.tc019
     - dovetail.nfvi.tc001
     - dovetail.nfvi.tc002
     - dovetail.nfvi.tc101

diff --git a/dovetail/report.py b/dovetail/report.py
index 286c389..6145ad8 100644 (file)
--- a/dovetail/report.py
+++ b/dovetail/report.py
@@ -214,13 +214,6 @@ class FunctestCrawler:
 
     def crawl_from_file(self, testcase=None):
         dovetail_config = dt_cfg.dovetail_config
-        file_path = \
-            os.path.join(dovetail_config['result_dir'],
-                         dovetail_config[self.type]['result']['file_path'])
-        if not os.path.exists(file_path):
-            self.logger.info('result file not found: %s', file_path)
-            return None
-
         criteria = 'FAIL'
         timestart = 0
         testcase_duration = 0
@@ -254,10 +247,9 @@ class FunctestCrawler:
                 return None
             with open(file_path, 'r') as myfile:
                 output = myfile.read()
-            error_logs = ""
 
-            for match in re.findall('(.*?)[. ]*FAILED', output):
-                error_logs += match
+            error_logs = " ".join(re.findall('(.*?)[. ]*fail ', output))
+            skipped = " ".join(re.findall('(.*?)[. ]*skip:', output))
 
             failed_num = int(re.findall(' - Failures: (\d*)', output)[0])
             if failed_num != 0:
@@ -268,7 +260,8 @@ class FunctestCrawler:
             json_results = {'criteria': criteria, 'details': {"timestart": '',
                             "duration": int(dur_sec_int),
                             "tests": int(num_tests), "failures": failed_num,
-                            "errors": error_logs}}
+                            "errors": error_logs,
+                            "skipped": skipped}}
 
         self.logger.debug('Results: %s', str(json_results))
         return json_results
@@ -402,6 +395,8 @@ class FunctestChecker:
         all_passed = True
         for sub_testcase in sub_testcase_list:
             self.logger.debug('check sub_testcase:%s', sub_testcase)
+            # TO DO: should think the test case when skipped, should think
+            # together with the "dovetail report"
             if sub_testcase in db_result['details']['errors']:
                 testcase.sub_testcase_passed(sub_testcase, False)
                 all_passed = False