From e5829e1e8b99d1df6ef00cebe804cb450e691881 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 21 Sep 2023 14:48:29 +0100 Subject: oeqa/runtime/parselogs: inline single-caller functions There's no need to have one-liner functions to get the MACHINE or WORKDIR when they're only called once. (From OE-Core rev: 9478a665641f55cdc14f12a4409121ef95883d74) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/parselogs.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'meta') diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py index e670df3ced..6e5dc75306 100644 --- a/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/meta/lib/oeqa/runtime/cases/parselogs.py @@ -223,12 +223,6 @@ class ParseLogsTest(OERuntimeTestCase): cls.log_locations = log_locations cls.msg = '' - def getMachine(self): - return self.td.get('MACHINE', '') - - def getWorkdir(self): - return self.td.get('WORKDIR', '') - # 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 # just add it to that list. @@ -251,7 +245,7 @@ class ParseLogsTest(OERuntimeTestCase): # Copy the log files to be parsed locally def transfer_logs(self, log_list): - workdir = self.getWorkdir() + workdir = self.td.get('WORKDIR') self.target_logs = workdir + '/' + 'target_logs' target_logs = self.target_logs if os.path.exists(target_logs): @@ -278,7 +272,7 @@ class ParseLogsTest(OERuntimeTestCase): grepcmd += '" ' + str(log) + " | grep -Eiv \'" try: - errorlist = ignore_errors[self.getMachine()] + errorlist = ignore_errors[self.td.get('MACHINE')] except KeyError: self.msg += 'No ignore list found for this machine, using default\n' errorlist = ignore_errors['default'] -- cgit v1.2.3-54-g00ecf