From 608bf2228d2903e5be80f1281f0e8dcaf7716143 Mon Sep 17 00:00:00 2001 From: Lucian Musat Date: Fri, 26 Jun 2015 13:36:40 +0300 Subject: [PATCH] oeqa/parselogs: Fixed a problem in parselogs When the test passed it returned an error because grep did not return any error and the variable that held the results was being referenced but not assigned any value. (From OE-Core rev: 0f5c2fb975010cf6e8154384b764a2c9da1b371e) Signed-off-by: Lucian Musat Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/parselogs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/parselogs.py b/meta/lib/oeqa/runtime/parselogs.py index a9ab9a3462..7095a365b4 100644 --- a/meta/lib/oeqa/runtime/parselogs.py +++ b/meta/lib/oeqa/runtime/parselogs.py @@ -198,6 +198,7 @@ class ParseLogsTest(oeRuntimeTest): def parse_logs(self, errors, ignore_errors, logs, lines_before = 10, lines_after = 10): results = {} rez = [] + grep_output = '' for log in logs: result = None thegrep = self.build_grepcmd(errors, ignore_errors, log) @@ -211,10 +212,10 @@ class ParseLogsTest(oeRuntimeTest): for xrez in rez: command = "grep \"\\"+str(xrez)+"\" -B "+str(lines_before)+" -A "+str(lines_after)+" "+str(log) try: - yrez = subprocess.check_output(command, shell=True) + grep_output = subprocess.check_output(command, shell=True) except: pass - results[log.replace('target_logs/','')][xrez]=yrez + results[log.replace('target_logs/','')][xrez]=grep_output return results #get the output of dmesg and write it in a file. This file is added to log_locations.