Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side Diff: build/android/pylib/browsertests/dispatch.py

Issue 13674021: [Android] Extend setup timeout for content_browsertests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import logging 5 import logging
6 import os 6 import os
7 7
8 from pylib import android_commands 8 from pylib import android_commands
9 from pylib import cmd_helper 9 from pylib import cmd_helper
10 from pylib import constants 10 from pylib import constants
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 # Get tests and split them up based on the number of devices. 56 # Get tests and split them up based on the number of devices.
57 if options.gtest_filter: 57 if options.gtest_filter:
58 all_tests = [t for t in options.gtest_filter.split(':') if t] 58 all_tests = [t for t in options.gtest_filter.split(':') if t]
59 else: 59 else:
60 all_enabled = gtest_dispatch.GetAllEnabledTests(RunnerFactory, 60 all_enabled = gtest_dispatch.GetAllEnabledTests(RunnerFactory,
61 attached_devices) 61 attached_devices)
62 all_tests = _FilterTests(all_enabled) 62 all_tests = _FilterTests(all_enabled)
63 63
64 # Run tests. 64 # Run tests.
65 # TODO(nileshagrawal): remove this abnormally long setup timeout once fewer
66 # files are pushed to the devices for content_browsertests: crbug.com/138275
67 setup_timeout = 20 * 60 # 20 minutes
65 test_results = shard.ShardAndRunTests(RunnerFactory, attached_devices, 68 test_results = shard.ShardAndRunTests(RunnerFactory, attached_devices,
66 all_tests, options.build_type, 69 all_tests, options.build_type,
70 setup_timeout=setup_timeout,
67 test_timeout=None) 71 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
68 report_results.LogFull( 72 report_results.LogFull(
69 results=test_results, 73 results=test_results,
70 test_type='Unit test', 74 test_type='Unit test',
71 test_package=constants.BROWSERTEST_SUITE_NAME, 75 test_package=constants.BROWSERTEST_SUITE_NAME,
72 build_type=options.build_type, 76 build_type=options.build_type,
73 flakiness_server=options.flakiness_dashboard_server) 77 flakiness_server=options.flakiness_dashboard_server)
74 report_results.PrintAnnotation(test_results) 78 report_results.PrintAnnotation(test_results)
75 79
76 def _FilterTests(all_enabled_tests): 80 def _FilterTests(all_enabled_tests):
77 """Filters out tests and fixtures starting with PRE_ and MANUAL_.""" 81 """Filters out tests and fixtures starting with PRE_ and MANUAL_."""
78 return [t for t in all_enabled_tests if _ShouldRunOnBot(t)] 82 return [t for t in all_enabled_tests if _ShouldRunOnBot(t)]
79 83
80 def _ShouldRunOnBot(test): 84 def _ShouldRunOnBot(test):
81 fixture, case = test.split('.', 1) 85 fixture, case = test.split('.', 1)
82 if _StartsWith(fixture, case, "PRE_"): 86 if _StartsWith(fixture, case, "PRE_"):
83 return False 87 return False
84 if _StartsWith(fixture, case, "MANUAL_"): 88 if _StartsWith(fixture, case, "MANUAL_"):
85 return False 89 return False
86 return True 90 return True
87 91
88 def _StartsWith(a, b, prefix): 92 def _StartsWith(a, b, prefix):
89 return a.startswith(prefix) or b.startswith(prefix) 93 return a.startswith(prefix) or b.startswith(prefix)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698