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

Side by Side Diff: base/test/test_timeouts.cc

Issue 46043006: GTTF: increase new test launcher timeout to one compatible with run_test_cases.py (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "base/test/test_timeouts.h" 5 #include "base/test/test_timeouts.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/debugger.h" 10 #include "base/debug/debugger.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 // static 61 // static
62 int TestTimeouts::tiny_timeout_ms_ = 100; 62 int TestTimeouts::tiny_timeout_ms_ = 100;
63 int TestTimeouts::action_timeout_ms_ = 10000; 63 int TestTimeouts::action_timeout_ms_ = 10000;
64 #ifndef NDEBUG 64 #ifndef NDEBUG
65 int TestTimeouts::action_max_timeout_ms_ = 45000; 65 int TestTimeouts::action_max_timeout_ms_ = 45000;
66 #else 66 #else
67 int TestTimeouts::action_max_timeout_ms_ = 30000; 67 int TestTimeouts::action_max_timeout_ms_ = 30000;
68 #endif // NDEBUG 68 #endif // NDEBUG
69 int TestTimeouts::large_test_timeout_ms_ = 10 * 60 * 1000; 69 int TestTimeouts::large_test_timeout_ms_ = 10 * 60 * 1000;
70 70
71 int TestTimeouts::test_launcher_timeout_ms_ = 45000; 71 int TestTimeouts::test_launcher_timeout_ms_ = 70000;
72 72
73 // static 73 // static
74 void TestTimeouts::Initialize() { 74 void TestTimeouts::Initialize() {
75 if (initialized_) { 75 if (initialized_) {
76 NOTREACHED(); 76 NOTREACHED();
77 return; 77 return;
78 } 78 }
79 initialized_ = true; 79 initialized_ = true;
80 80
81 if (base::debug::BeingDebugged()) { 81 if (base::debug::BeingDebugged()) {
(...skipping 17 matching lines...) Expand all
99 InitializeTimeout(switches::kTestLauncherTimeout, action_timeout_ms_, 99 InitializeTimeout(switches::kTestLauncherTimeout, action_timeout_ms_,
100 &test_launcher_timeout_ms_); 100 &test_launcher_timeout_ms_);
101 101
102 // The timeout values should be increasing in the right order. 102 // The timeout values should be increasing in the right order.
103 CHECK(tiny_timeout_ms_ <= action_timeout_ms_); 103 CHECK(tiny_timeout_ms_ <= action_timeout_ms_);
104 CHECK(action_timeout_ms_ <= action_max_timeout_ms_); 104 CHECK(action_timeout_ms_ <= action_max_timeout_ms_);
105 CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_); 105 CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
106 106
107 CHECK(action_timeout_ms_ <= test_launcher_timeout_ms_); 107 CHECK(action_timeout_ms_ <= test_launcher_timeout_ms_);
108 } 108 }
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