summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authornileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-10 02:05:37 +0000
committernileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-10 02:05:37 +0000
commitc92d09e892daa221fe2ad42f64c314c1a8dffcac (patch)
tree5c69ece1f8113bf74c30975244ccc659d1059482 /build
parent1e4c352b802fd6838606670a256be28bacce85aa (diff)
downloadchromium_src-c92d09e892daa221fe2ad42f64c314c1a8dffcac.zip
chromium_src-c92d09e892daa221fe2ad42f64c314c1a8dffcac.tar.gz
chromium_src-c92d09e892daa221fe2ad42f64c314c1a8dffcac.tar.bz2
Android: Propagate timeouts when sharding(and retrying) tests.
We use TestResult.GetAllBroken to identify and retry tests. However, this list is empty if a test times out (and the device is responsive). In this case we should propagate the timed_out info to the final result, which will report a STEP_FAILURE based on this information. Ex. bad run: http://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20%28dbg%29/builds/6093/steps/sandbox_linux_unittests/logs/stdio BUG=169064 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11833017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/android/pylib/base_test_sharder.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/build/android/pylib/base_test_sharder.py b/build/android/pylib/base_test_sharder.py
index 1c4559a..387038d 100644
--- a/build/android/pylib/base_test_sharder.py
+++ b/build/android/pylib/base_test_sharder.py
@@ -136,6 +136,9 @@ 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
self.tests = []
for t in test_results.GetAllBroken():
self.tests += [t.name]