4a2d9b1b20
This is a partial revert of: https://crrev.com/c/890938 and https://crrev.com/c/893982 Before this CL, the test runner blocked on ongoing tests in order to process their results after an internal timeout. However, the logic required for this feature was overly complicated and prevented an acceptable implementation for fast aborts. Furthermore, also the fuzzers suffered from timeouts on swarming due to hanging tests. Instead, we now abort immediately on internal timeout (used on fuzzers), SIGINT (Ctrl-C) and SIGTERM. Ongoing tests are immediately terminated and their results are disregarded. On SIGTERM and SIGINT, we return with non-zero exit codes, and zero on internal timeout. This will also properly return json output, when the external hard timeout is reached on swarming (causes SIGTERM). TBR=sergiyb@chromium.org Bug: v8:7423, chromium:813065 Change-Id: Ib20f835f58a0970693bdd3b21dc5d766d8e115d8 Reviewed-on: https://chromium-review.googlesource.com/924852 Reviewed-by: Michael Achenbach <machenbach@chromium.org> Commit-Queue: Michael Achenbach <machenbach@chromium.org> Cr-Commit-Position: refs/heads/master@{#51399}
63 lines
1.8 KiB
Python
Executable File
63 lines
1.8 KiB
Python
Executable File
#!/usr/bin/env python
|
|
# Copyright 2014 the V8 project authors. All rights reserved.
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
|
|
import os
|
|
import sys
|
|
import unittest
|
|
|
|
# Needed because the test runner contains relative imports.
|
|
TOOLS_PATH = os.path.dirname(os.path.dirname(os.path.dirname(
|
|
os.path.abspath(__file__))))
|
|
sys.path.append(TOOLS_PATH)
|
|
|
|
from testrunner.local.pool import Pool
|
|
|
|
def Run(x):
|
|
if x == 10:
|
|
raise Exception("Expected exception triggered by test.")
|
|
return x
|
|
|
|
class PoolTest(unittest.TestCase):
|
|
def testNormal(self):
|
|
results = set()
|
|
pool = Pool(3)
|
|
for result in pool.imap_unordered(Run, [[x] for x in range(0, 10)]):
|
|
if result.heartbeat:
|
|
# Any result can be a heartbeat due to timings.
|
|
continue
|
|
results.add(result.value)
|
|
self.assertEquals(set(range(0, 10)), results)
|
|
|
|
def testException(self):
|
|
results = set()
|
|
pool = Pool(3)
|
|
with self.assertRaises(Exception):
|
|
for result in pool.imap_unordered(Run, [[x] for x in range(0, 12)]):
|
|
if result.heartbeat:
|
|
# Any result can be a heartbeat due to timings.
|
|
continue
|
|
# Item 10 will not appear in results due to an internal exception.
|
|
results.add(result.value)
|
|
expect = set(range(0, 12))
|
|
expect.remove(10)
|
|
self.assertEquals(expect, results)
|
|
|
|
def testAdd(self):
|
|
results = set()
|
|
pool = Pool(3)
|
|
for result in pool.imap_unordered(Run, [[x] for x in range(0, 10)]):
|
|
if result.heartbeat:
|
|
# Any result can be a heartbeat due to timings.
|
|
continue
|
|
results.add(result.value)
|
|
if result.value < 30:
|
|
pool.add([result.value + 20])
|
|
self.assertEquals(set(range(0, 10) + range(20, 30) + range(40, 50)),
|
|
results)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|