Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1006511: Print script timeout stacks if they came from a python test; r=jgriffin

Browse Source
This commit is contained in:
David Burns 2014-05-27 23:37:56 +01:00
parent 3ca1adab0e
commit d7bd63c6e0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testing/marionette/client/marionette/runner/base.py
View File

@ -12,6 +12,7 @@ import sys
import time
import traceback
import random
import re
import mozinfo
import moznetwork
import xml.dom.minidom as dom
@ -222,6 +223,7 @@ class MarionetteTestResult(unittest._TextTestResult, TestResultCollection):
self.stream.writeln(self.separator2)
lastline = None
fail_present = None
test_name = self.getInfo(error)
for line in err:
if not line.startswith('\t') and line != '':
lastline = line
@ -229,11 +231,15 @@ class MarionetteTestResult(unittest._TextTestResult, TestResultCollection):
fail_present = True
for line in err:
if line != lastline or fail_present:
if error.reason != TIMEOUT_MESSAGE:
if re.match('.*\.js', test_name):
if error.reason != TIMEOUT_MESSAGE:
self.stream.writeln("%s" % line)
else:
self.stream.writeln("%s" % line)
else:
self.stream.writeln("TEST-UNEXPECTED-FAIL | %s | %s" %
(self.getInfo(error), error.reason))
(test_name, error.reason))
def stopTest(self, *args, **kwargs):
unittest._TextTestResult.stopTest(self, *args, **kwargs)