diff options
author | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-19 03:34:07 +0000 |
---|---|---|
committer | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-19 03:34:07 +0000 |
commit | a6967757470331eeb10d06e5f659274b23d96dec (patch) | |
tree | 7b63c47a9238c7f0709088df21c1f27310f399ab /build | |
parent | 36996e60191de8b5cfcb0e30146df6b85e23a0ff (diff) | |
download | chromium_src-a6967757470331eeb10d06e5f659274b23d96dec.zip chromium_src-a6967757470331eeb10d06e5f659274b23d96dec.tar.gz chromium_src-a6967757470331eeb10d06e5f659274b23d96dec.tar.bz2 |
[Android] Fix the reference to timed_out in BaseTestSharder retry logic.
NOTRY=true
BUG=171046
Review URL: https://codereview.chromium.org/11929038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r-- | build/android/pylib/base/base_test_sharder.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/build/android/pylib/base/base_test_sharder.py b/build/android/pylib/base/base_test_sharder.py index 7362101..e33ff87 100644 --- a/build/android/pylib/base/base_test_sharder.py +++ b/build/android/pylib/base/base_test_sharder.py @@ -127,6 +127,10 @@ class BaseTestSharder(object): retry_devices -= TestResults.DeviceExceptions(results_lists) # Retry on devices that didn't have any exception. self.attached_devices = list(retry_devices) + + # TODO(frankf): Fix the retry logic: + # - GetAllBroken() should report all tests not ran. + # - Do not break TestResults encapsulation. if (retry == self.retries - 1 or len(self.attached_devices) == 0): all_passed = final_results.ok + test_results.ok @@ -135,9 +139,11 @@ class BaseTestSharder(object): break else: final_results.ok += test_results.ok - # Timed out tests are not reported in GetAllBroken(). - if test_results.timed_out: - final_results.timed_out = True + final_results.overall_timed_out = (final_results.overall_timed_out or + test_results.overall_timed_out) + final_results.overall_fail = (final_results.overall_fail or + test_results.overall_fail) + self.tests = [] for t in test_results.GetAllBroken(): self.tests += [t.name] |