From 296721c2bdc5dceeef9a277c5806999f08472eaa Mon Sep 17 00:00:00 2001 From: David Burns Date: Sat, 3 May 2014 21:02:38 +0100 Subject: [PATCH] Bug 967813: Put the error reason in the message that is reported on TBPL for easier starring; r=philor --- testing/marionette/client/marionette/runner/base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/marionette/client/marionette/runner/base.py b/testing/marionette/client/marionette/runner/base.py index 4040dc332f4..0dd43bc31a3 100644 --- a/testing/marionette/client/marionette/runner/base.py +++ b/testing/marionette/client/marionette/runner/base.py @@ -222,7 +222,7 @@ class MarionetteTestResult(unittest._TextTestResult, TestResultCollection): lastline = None fail_present = None for line in err: - if not line.startswith('\t'): + if not line.startswith('\t') and line != '': lastline = line if 'TEST-UNEXPECTED-FAIL' in line: fail_present = True @@ -231,7 +231,7 @@ class MarionetteTestResult(unittest._TextTestResult, TestResultCollection): self.stream.writeln("%s" % line) else: self.stream.writeln("TEST-UNEXPECTED-FAIL | %s | %s" % - (self.getInfo(error), line)) + (self.getInfo(error), error.reason)) def stopTest(self, *args, **kwargs): unittest._TextTestResult.stopTest(self, *args, **kwargs) @@ -623,7 +623,7 @@ class BaseMarionetteTestRunner(object): # for XML output self.testvars['xml_output'] = self.xml_output self.results = [] - + @property def capabilities(self): if self._capabilities: