From b4e96b4f4e680b6d17eacad74174767f91444ec3 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 15 Mar 2019 07:39:04 -0300 Subject: [PATCH] validate:launcher: Enhance dumping log files output --- validate/launcher/baseclasses.py | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py index 3c67a5482b..3e48b8a176 100644 --- a/validate/launcher/baseclasses.py +++ b/validate/launcher/baseclasses.py @@ -140,14 +140,14 @@ class Test(Loggable): if self.result != Result.NOT_RUN: string += ": " + self.result if self.result in [Result.FAILED, Result.TIMEOUT]: - string += " '%s'\n" \ - " You can reproduce with: %s\n" \ - % (self.message, self.get_command_repr()) - - if not self.options.redirect_logs and \ - self.result == Result.PASSED or \ - not self.options.dump_on_failure: - string += self.get_logfile_repr() + string += " '%s'" % self.message + if not self.options.dump_on_failure: + string += "\n You can reproduce with: %s\n" % \ + self.get_command_repr() + if not self.options.redirect_logs and self.result != Result.PASSED: + string += self.get_logfile_repr() + else: + string = "\n==> %s" % string return string @@ -522,11 +522,10 @@ class Test(Loggable): self.command = self.use_valgrind(self.command, self.proc_env) if not self.options.redirect_logs: - self.out.write("=================\n" - "Test name: %s\n" + self.out.write("Test name: %s\n" "Command: '%s'\n" - "=================\n\n" - % (self.classname, self.get_command_repr())) + "%s\n" + % (self.classname, self.get_command_repr(), '-' * 80)) self.out.flush() else: message = "Launching: %s%s\n" \ @@ -542,14 +541,14 @@ class Test(Loggable): self.start_ts = time.time() def _dump_log_file(self, logfile): - message = "Dumping contents of %s\n" % logfile - printc(message, Colors.FAIL) + message = "> Dumping %s\n>" % logfile + printc(message) with open(logfile, 'r') as fin: - print(fin.read()) + for line in fin.readlines(): + print('> ' + line, end='') def _dump_log_files(self): - printc("Dumping log files on failure\n", Colors.FAIL) self._dump_log_file(self.logfile) for logfile in self.extra_logfiles: self._dump_log_file(logfile)