Index: build/android/pylib/browsertests/dispatch.py |
diff --git a/build/android/pylib/browsertests/dispatch.py b/build/android/pylib/browsertests/dispatch.py |
index b9164777428a169dd69fe8b46e58c007a54a2f9a..de6411a9841138b30b50fc44ea1ba5fcfb79ca6d 100644 |
--- a/build/android/pylib/browsertests/dispatch.py |
+++ b/build/android/pylib/browsertests/dispatch.py |
@@ -62,8 +62,12 @@ def Dispatch(options): |
all_tests = _FilterTests(all_enabled) |
# Run tests. |
+ # TODO(nileshagrawal): remove this abnormally long setup timeout once fewer |
+ # files are pushed to the devices for content_browsertests: crbug.com/138275 |
+ setup_timeout = 20 * 60 # 20 minutes |
test_results = shard.ShardAndRunTests(RunnerFactory, attached_devices, |
all_tests, options.build_type, |
+ setup_timeout=setup_timeout, |
test_timeout=None) |
nilesh
2013/04/05 21:23:54
we also need more than 7 mins to run these, specia
newt (away)
2013/04/05 21:41:25
test_timeout=None means they can't time out. see:
craigdh
2013/04/05 22:00:03
Both content_browsertests and gtests have timeouts
craigdh
2013/04/05 22:18:37
In that case please take out test_timeout=None, I
|
report_results.LogFull( |
results=test_results, |