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

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

Issue 476543004: Implement unit test specific test launcher timeout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
« base/test/test_timeouts.h ('K') | « base/test/test_timeouts.h ('k') | 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 // static 66 // static
67 int TestTimeouts::tiny_timeout_ms_ = 100; 67 int TestTimeouts::tiny_timeout_ms_ = 100;
68 int TestTimeouts::action_timeout_ms_ = 10000; 68 int TestTimeouts::action_timeout_ms_ = 10000;
69 #ifndef NDEBUG 69 #ifndef NDEBUG
70 int TestTimeouts::action_max_timeout_ms_ = 45000; 70 int TestTimeouts::action_max_timeout_ms_ = 45000;
71 #else 71 #else
72 int TestTimeouts::action_max_timeout_ms_ = 30000; 72 int TestTimeouts::action_max_timeout_ms_ = 30000;
73 #endif // NDEBUG 73 #endif // NDEBUG
74 int TestTimeouts::large_test_timeout_ms_ = 10 * 60 * 1000; 74 int TestTimeouts::large_test_timeout_ms_ = 10 * 60 * 1000;
75 75
76 int TestTimeouts::test_launcher_unit_timeout_ms_ = 5000;
76 int TestTimeouts::test_launcher_timeout_ms_ = 45000; 77 int TestTimeouts::test_launcher_timeout_ms_ = 45000;
77 78
78 // static 79 // static
79 void TestTimeouts::Initialize() { 80 void TestTimeouts::Initialize() {
80 if (initialized_) { 81 if (initialized_) {
81 NOTREACHED(); 82 NOTREACHED();
82 return; 83 return;
83 } 84 }
84 initialized_ = true; 85 initialized_ = true;
85 86
86 if (base::debug::BeingDebugged()) { 87 if (base::debug::BeingDebugged()) {
87 fprintf(stdout, 88 fprintf(stdout,
88 "Detected presence of a debugger, running without test timeouts.\n"); 89 "Detected presence of a debugger, running without test timeouts.\n");
89 } 90 }
90 91
91 // Note that these timeouts MUST be initialized in the correct order as 92 // Note that these timeouts MUST be initialized in the correct order as
92 // per the CHECKS below. 93 // per the CHECKS below.
93 InitializeTimeout(switches::kTestTinyTimeout, &tiny_timeout_ms_); 94 InitializeTimeout(switches::kTestTinyTimeout, &tiny_timeout_ms_);
94 InitializeTimeout(switches::kUiTestActionTimeout, 95 InitializeTimeout(switches::kUiTestActionTimeout,
95 base::debug::BeingDebugged() ? kAlmostInfiniteTimeoutMs 96 base::debug::BeingDebugged() ? kAlmostInfiniteTimeoutMs
96 : tiny_timeout_ms_, 97 : tiny_timeout_ms_,
97 &action_timeout_ms_); 98 &action_timeout_ms_);
98 InitializeTimeout(switches::kUiTestActionMaxTimeout, action_timeout_ms_, 99 InitializeTimeout(switches::kUiTestActionMaxTimeout, action_timeout_ms_,
99 &action_max_timeout_ms_); 100 &action_max_timeout_ms_);
100 InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_, 101 InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_,
101 &large_test_timeout_ms_); 102 &large_test_timeout_ms_);
102 103
103 // Test launcher timeout is independent from anything above action timeout. 104 // Test launcher timeout is independent from anything above action timeout.
104 InitializeTimeout(switches::kTestLauncherTimeout, action_timeout_ms_, 105 InitializeTimeout(switches::kTestLauncherUnitTimeout, action_timeout_ms_,
106 &test_launcher_unit_timeout_ms_);
107 InitializeTimeout(switches::kTestLauncherTimeout,
108 test_launcher_unit_timeout_ms_,
105 &test_launcher_timeout_ms_); 109 &test_launcher_timeout_ms_);
106 110
107 // The timeout values should be increasing in the right order. 111 // The timeout values should be increasing in the right order.
108 CHECK(tiny_timeout_ms_ <= action_timeout_ms_); 112 CHECK(tiny_timeout_ms_ <= action_timeout_ms_);
109 CHECK(action_timeout_ms_ <= action_max_timeout_ms_); 113 CHECK(action_timeout_ms_ <= action_max_timeout_ms_);
110 CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_); 114 CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
111 115
112 CHECK(action_timeout_ms_ <= test_launcher_timeout_ms_); 116 CHECK(action_timeout_ms_ <= test_launcher_unit_timeout_ms_);
117 CHECK(test_launcher_unit_timeout_ms_ <= test_launcher_timeout_ms_);
113 } 118 }
OLDNEW
« base/test/test_timeouts.h ('K') | « base/test/test_timeouts.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698