d852ae6f2b
Procs return the result by increasing recursion through result_for. This CL eliminates that mechanism from the Processor interface and uses boolen return values for sending tests to signal success or the failure to load the test into the execution queue. R=machenbach@chromium.org CC=yangguo@chromium.org,sergiyb@chromium.org Bug: v8:8174,v8:8731 Change-Id: I073a86ca84bcf88da11132b90013d4c8455bc61e Reviewed-on: https://chromium-review.googlesource.com/c/1439239 Commit-Queue: Tamer Tas <tmrts@chromium.org> Reviewed-by: Michael Achenbach <machenbach@chromium.org> Reviewed-by: Sergiy Belozorov <sergiyb@chromium.org> Cr-Commit-Position: refs/heads/master@{#59201}
60 lines
1.8 KiB
Python
60 lines
1.8 KiB
Python
# Copyright 2018 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 collections
|
|
|
|
from . import base
|
|
from .result import RerunResult
|
|
|
|
|
|
class RerunProc(base.TestProcProducer):
|
|
def __init__(self, rerun_max, rerun_max_total=None):
|
|
super(RerunProc, self).__init__('Rerun')
|
|
self._requirement = base.DROP_OUTPUT
|
|
|
|
self._rerun = {}
|
|
self._results = collections.defaultdict(list)
|
|
self._rerun_max = rerun_max
|
|
self._rerun_total_left = rerun_max_total
|
|
|
|
def _next_test(self, test):
|
|
return self._send_next_subtest(test)
|
|
|
|
def _result_for(self, test, subtest, result):
|
|
# First result
|
|
if subtest.procid[-2:] == '-1':
|
|
# Passed, no reruns
|
|
if not result.has_unexpected_output:
|
|
self._send_result(test, result)
|
|
return
|
|
|
|
self._rerun[test.procid] = 0
|
|
|
|
results = self._results[test.procid]
|
|
results.append(result)
|
|
|
|
if not self.is_stopped and self._needs_rerun(test, result):
|
|
self._rerun[test.procid] += 1
|
|
if self._rerun_total_left is not None:
|
|
self._rerun_total_left -= 1
|
|
self._send_next_subtest(test, self._rerun[test.procid])
|
|
else:
|
|
result = RerunResult.create(results)
|
|
self._finalize_test(test)
|
|
self._send_result(test, result)
|
|
|
|
def _needs_rerun(self, test, result):
|
|
# TODO(majeski): Limit reruns count for slow tests.
|
|
return ((self._rerun_total_left is None or self._rerun_total_left > 0) and
|
|
self._rerun[test.procid] < self._rerun_max and
|
|
result.has_unexpected_output)
|
|
|
|
def _send_next_subtest(self, test, run=0):
|
|
subtest = self._create_subtest(test, str(run + 1), keep_output=(run != 0))
|
|
return self._send_test(subtest)
|
|
|
|
def _finalize_test(self, test):
|
|
del self._rerun[test.procid]
|
|
del self._results[test.procid]
|