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

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

Issue 7595008: Increase test timeout to 45s. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
« 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/test/test_switches.h" 10 #include "base/test/test_switches.h"
(...skipping 26 matching lines...) Expand all
37 37
38 } // namespace 38 } // namespace
39 39
40 // static 40 // static
41 bool TestTimeouts::initialized_ = false; 41 bool TestTimeouts::initialized_ = false;
42 42
43 // The timeout values should increase in the order they appear in this block. 43 // The timeout values should increase in the order they appear in this block.
44 // static 44 // static
45 int TestTimeouts::tiny_timeout_ms_ = 100; 45 int TestTimeouts::tiny_timeout_ms_ = 100;
46 int TestTimeouts::action_timeout_ms_ = 2000; 46 int TestTimeouts::action_timeout_ms_ = 2000;
47 int TestTimeouts::action_max_timeout_ms_ = 31000; 47 int TestTimeouts::action_max_timeout_ms_ = 45000;
48 int TestTimeouts::large_test_timeout_ms_ = 3 * 60 * 1000; 48 int TestTimeouts::large_test_timeout_ms_ = 3 * 60 * 1000;
49 int TestTimeouts::huge_test_timeout_ms_ = 10 * 60 * 1000; 49 int TestTimeouts::huge_test_timeout_ms_ = 10 * 60 * 1000;
50 50
51 // static 51 // static
52 int TestTimeouts::live_operation_timeout_ms_ = 45000; 52 int TestTimeouts::live_operation_timeout_ms_ = 45000;
53 53
54 // static 54 // static
55 void TestTimeouts::Initialize() { 55 void TestTimeouts::Initialize() {
56 if (initialized_) { 56 if (initialized_) {
57 NOTREACHED(); 57 NOTREACHED();
(...skipping 17 matching lines...) Expand all
75 75
76 // The timeout values should be increasing in the right order. 76 // The timeout values should be increasing in the right order.
77 CHECK(tiny_timeout_ms_ <= action_timeout_ms_); 77 CHECK(tiny_timeout_ms_ <= action_timeout_ms_);
78 CHECK(action_timeout_ms_ <= action_max_timeout_ms_); 78 CHECK(action_timeout_ms_ <= action_max_timeout_ms_);
79 CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_); 79 CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
80 CHECK(large_test_timeout_ms_ <= huge_test_timeout_ms_); 80 CHECK(large_test_timeout_ms_ <= huge_test_timeout_ms_);
81 81
82 InitializeTimeout(switches::kLiveOperationTimeout, 82 InitializeTimeout(switches::kLiveOperationTimeout,
83 &live_operation_timeout_ms_); 83 &live_operation_timeout_ms_);
84 } 84 }
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