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

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

Issue 3391026: Remove sleep_timeout from TestTimeouts. (Closed)
Patch Set: Created 10 years, 2 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/test/test_timeouts.h" 5 #include "chrome/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 "chrome/test/test_switches.h" 10 #include "chrome/test/test_switches.h"
(...skipping 30 matching lines...) Expand all
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::action_timeout_ms_ = 2000; 45 int TestTimeouts::action_timeout_ms_ = 2000;
46 int TestTimeouts::action_max_timeout_ms_ = 15000; 46 int TestTimeouts::action_max_timeout_ms_ = 15000;
47 int TestTimeouts::large_test_timeout_ms_ = 3 * 60 * 1000; 47 int TestTimeouts::large_test_timeout_ms_ = 3 * 60 * 1000;
48 int TestTimeouts::huge_test_timeout_ms_ = 10 * 60 * 1000; 48 int TestTimeouts::huge_test_timeout_ms_ = 10 * 60 * 1000;
49 49
50 // static 50 // static
51 int TestTimeouts::sleep_timeout_ms_ = 2000;
52
53 // static
54 int TestTimeouts::command_execution_timeout_ms_ = 25000; 51 int TestTimeouts::command_execution_timeout_ms_ = 25000;
55 52
56 // static 53 // static
57 int TestTimeouts::wait_for_terminate_timeout_ms_ = 15000; 54 int TestTimeouts::wait_for_terminate_timeout_ms_ = 15000;
58 55
59 // static 56 // static
60 int TestTimeouts::live_operation_timeout_ms_ = 30000; 57 int TestTimeouts::live_operation_timeout_ms_ = 30000;
61 58
62 // static 59 // static
63 void TestTimeouts::Initialize() { 60 void TestTimeouts::Initialize() {
(...skipping 11 matching lines...) Expand all
75 InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_, 72 InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_,
76 &large_test_timeout_ms_); 73 &large_test_timeout_ms_);
77 InitializeTimeout(switches::kUiTestTimeout, large_test_timeout_ms_, 74 InitializeTimeout(switches::kUiTestTimeout, large_test_timeout_ms_,
78 &huge_test_timeout_ms_); 75 &huge_test_timeout_ms_);
79 76
80 // The timeout values should be increasing in the right order. 77 // The timeout values should be increasing in the right order.
81 CHECK(action_timeout_ms_ <= action_max_timeout_ms_); 78 CHECK(action_timeout_ms_ <= action_max_timeout_ms_);
82 CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_); 79 CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
83 CHECK(large_test_timeout_ms_ <= huge_test_timeout_ms_); 80 CHECK(large_test_timeout_ms_ <= huge_test_timeout_ms_);
84 81
85 InitializeTimeout(switches::kUiTestSleepTimeout, &sleep_timeout_ms_);
86 InitializeTimeout(switches::kUiTestCommandExecutionTimeout, 82 InitializeTimeout(switches::kUiTestCommandExecutionTimeout,
87 &command_execution_timeout_ms_); 83 &command_execution_timeout_ms_);
88 InitializeTimeout(switches::kUiTestTerminateTimeout, 84 InitializeTimeout(switches::kUiTestTerminateTimeout,
89 &wait_for_terminate_timeout_ms_); 85 &wait_for_terminate_timeout_ms_);
90 86
91 InitializeTimeout(switches::kLiveOperationTimeout, 87 InitializeTimeout(switches::kLiveOperationTimeout,
92 &live_operation_timeout_ms_); 88 &live_operation_timeout_ms_);
93 } 89 }
OLDNEW
« no previous file with comments | « chrome/test/test_timeouts.h ('k') | chrome/test/ui/ui_test.h » ('j') | chrome/test/ui/ui_test.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698