mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

oeqa/runtime/parselogs: move some variables out of global scope

Browse Source 
errors and log_locations can be trivially set in the class directly,
instead of being defined in the module and then copied into the class.

(From OE-Core rev: dd1416b719a30b18f21916d50fa431a88503918f)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2023-09-23 14:04:09 +01:00
committed by Richard Purdie
parent 50c637e6dc
commit 17dbdc677a
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/runtime/cases/parselogs.py
+9 -10
View File
@@ -11,9 +11,6 @@ from shutil import rmtree
from oeqa.runtime.case import OERuntimeTestCase from oeqa.runtime.case import OERuntimeTestCase
from oeqa.core.decorator.depends import OETestDepends from oeqa.core.decorator.depends import OETestDepends
#in the future these lists could be moved outside of module
errors = ["error", "cannot", "can\'t", "failed"]
common_errors = [ common_errors = [
"(WW) warning, (EE) error, (NI) not implemented, (??) unknown.", "(WW) warning, (EE) error, (NI) not implemented, (??) unknown.",
"dma timeout", "dma timeout",
@@ -201,17 +198,19 @@ ignore_errors = {
] + common_errors, ] + common_errors,
} }
log_locations = ["/var/log/","/var/log/dmesg", "/tmp/dmesg_output.log"]
class ParseLogsTest(OERuntimeTestCase): class ParseLogsTest(OERuntimeTestCase):
# Which log files should be collected
log_locations = ["/var/log/", "/var/log/dmesg", "/tmp/dmesg_output.log"]
# The keywords that identify error messages in the log files
errors = ["error", "cannot", "can't", "failed"]
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.errors = errors
# When systemd is enabled we need to notice errors on # When systemd is enabled we need to notice errors on
# circular dependencies in units. # circular dependencies in units.
if 'systemd' in cls.td.get('DISTRO_FEATURES', ''): if 'systemd' in cls.td.get('DISTRO_FEATURES'):
cls.errors.extend([ cls.errors.extend([
'Found ordering cycle on', 'Found ordering cycle on',
'Breaking ordering cycle by deleting job', 'Breaking ordering cycle by deleting job',
@@ -220,8 +219,6 @@ class ParseLogsTest(OERuntimeTestCase):
]) ])
cls.ignore_errors = ignore_errors cls.ignore_errors = ignore_errors
cls.log_locations = log_locations
cls.msg = ''
# Go through the log locations provided and if it's a folder # Go through the log locations provided and if it's a folder
# create a list with all the .log files in it, if it's a file # create a list with all the .log files in it, if it's a file
@@ -338,7 +335,9 @@ class ParseLogsTest(OERuntimeTestCase):
self.write_dmesg() self.write_dmesg()
log_list = self.get_local_log_list(self.log_locations) log_list = self.get_local_log_list(self.log_locations)
result = self.parse_logs(log_list) result = self.parse_logs(log_list)
errcount = 0 errcount = 0
self.msg = ""
for log in result: for log in result:
self.msg += 'Log: ' + log + '\n' self.msg += 'Log: ' + log + '\n'
self.msg += '-----------------------\n' self.msg += '-----------------------\n'