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

Unified 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 side-by-side diff with in-line comments
Download patch
« base/test/test_timeouts.h ('K') | « base/test/test_timeouts.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/test_timeouts.cc
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index 006df46720dfc73af4905dde2d2a727061d47648..dc7a0d83d7a05a04f435f41b9d2ecb4143a8523d 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -73,6 +73,7 @@ int TestTimeouts::action_max_timeout_ms_ = 30000;
#endif // NDEBUG
int TestTimeouts::large_test_timeout_ms_ = 10 * 60 * 1000;
+int TestTimeouts::test_launcher_unit_timeout_ms_ = 5000;
int TestTimeouts::test_launcher_timeout_ms_ = 45000;
// static
@@ -101,7 +102,10 @@ void TestTimeouts::Initialize() {
&large_test_timeout_ms_);
// Test launcher timeout is independent from anything above action timeout.
- InitializeTimeout(switches::kTestLauncherTimeout, action_timeout_ms_,
+ InitializeTimeout(switches::kTestLauncherUnitTimeout, action_timeout_ms_,
+ &test_launcher_unit_timeout_ms_);
+ InitializeTimeout(switches::kTestLauncherTimeout,
+ test_launcher_unit_timeout_ms_,
&test_launcher_timeout_ms_);
// The timeout values should be increasing in the right order.
@@ -109,5 +113,6 @@ void TestTimeouts::Initialize() {
CHECK(action_timeout_ms_ <= action_max_timeout_ms_);
CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
- CHECK(action_timeout_ms_ <= test_launcher_timeout_ms_);
+ CHECK(action_timeout_ms_ <= test_launcher_unit_timeout_ms_);
+ CHECK(test_launcher_unit_timeout_ms_ <= test_launcher_timeout_ms_);
}
« 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