]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
oeqa/runtime/parselogs: inline single-caller functions
authorRoss Burton <ross.burton@arm.com>
Thu, 21 Sep 2023 13:48:29 +0000 (14:48 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 22 Sep 2023 06:43:51 +0000 (07:43 +0100)
There's no need to have one-liner functions to get the MACHINE or
WORKDIR when they're only called once.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/runtime/cases/parselogs.py

index e670df3cedde1c11d3de847d55d82a567a0366ed..6e5dc7530601823aa1510d7902174fa17f855caf 100644 (file)
@@ -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']