mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-07-25 06:47:01 +00:00
Code Issues Projects Releases Wiki Activity

oeqa/logparser: Various misc cleanups

Browse Source 
Get rid of further unneeded code complications:

* value mappings we could just direct use
* ftools when we can write files easily ourself
* test result status filtering we don't use
* variable overwriting module imports

(From OE-Core rev: d6065f136f6d353c3054cc3f440a4e259509f876)

(From OE-Core rev: ba944a72302fa088c31c7b1eee4ad9f64f9769e4)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2019-01-29 16:52:18 +00:00
parent c792536bcb
commit ddabcfa8ea
2 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/utils/logparser.py
+8 -13
View File
@@ -3,7 +3,6 @@
import sys
import os
import re
from . import ftools
# A parser that can be used to identify weather a line is a test result or a section statement.
class PtestParser(object):
@@ -13,9 +12,9 @@ class PtestParser(object):
def parse(self, logfile):
test_regex = {}
test_regex['pass'] = re.compile(r"^PASS:(.+)")
test_regex['fail'] = re.compile(r"^FAIL:(.+)")
test_regex['skip'] = re.compile(r"^SKIP:(.+)")
test_regex['PASSED'] = re.compile(r"^PASS:(.+)")
test_regex['FAILED'] = re.compile(r"^FAIL:(.+)")
test_regex['SKIPPED'] = re.compile(r"^SKIP:(.+)")
section_regex = {}
section_regex['begin'] = re.compile(r"^BEGIN: .*/(.+)/ptest")
@@ -72,9 +71,7 @@ class PtestParser(object):
return self.results, self.sections
# Log the results as files. The file name is the section name and the contents are the tests in that section.
def results_as_files(self, target_dir, test_status):
if not type(test_status) == type([]):
raise Exception("test_status should be a list. Got " + str(test_status) + " instead.")
def results_as_files(self, target_dir):
if not os.path.exists(target_dir):
raise Exception("Target directory does not exist: %s" % target_dir)
@@ -84,10 +81,8 @@ class PtestParser(object):
prefix = section
section_file = os.path.join(target_dir, prefix)
# purge the file contents if it exists
open(section_file, 'w').close()
for test_name in sorted(self.results[section]):
status = self.results[section][test_name]
# we log only the tests with status in the test_status list
if status in test_status:
ftools.append_file(section_file, status + ": " + test_name)
with open(section_file, 'w') as f:
for test_name in sorted(self.results[section]):
status = self.results[section][test_name]
f.write(status + ": " + test_name + "\n")