wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 911249 - Don't block XPCShell test harness on hangs caused by os.kill on Windows. r=ted

Browse Source
This commit is contained in:
Mihnea Dobrescu-Balaur 2013-09-01 13:02:51 -07:00
parent 8be7d9317f
commit 95dc91cfd3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
testing/xpcshell/runxpcshelltests.py
View File

@ -135,6 +135,7 @@ class XPCShellTestThread(Thread):
# event from main thread to signal work done
self.event = event
self.done = False # explicitly set flag so we don't rely on thread.isAlive
def run(self):
try:
@ -148,6 +149,7 @@ class XPCShellTestThread(Thread):
if self.retry:
self.log.info("TEST-INFO | %s | Test failed or timed out, will retry."
% self.test_object['name'])
self.done = True
self.event.set()
def kill(self, proc):
@ -218,6 +220,7 @@ class XPCShellTestThread(Thread):
def testTimeout(self, test_file, processPID):
if not self.retry:
self.log.error("TEST-UNEXPECTED-FAIL | %s | Test timed out" % test_file)
self.done = True
Automation().killAndGetStackNoScreenshot(processPID, self.appPath, self.debuggerInfo)
def buildCmdTestFile(self, name):
@ -1347,7 +1350,7 @@ class XPCShellTests(object):
# find what tests are done (might be more than 1)
done_tests = set()
for test in running_tests:
if not test.is_alive():
if test.done:
done_tests.add(test)
test.join()
# if the test had trouble, we will try running it again