diff options
| author | Paweł Hajdan, Jr <phajdan.jr@chromium.org> | 2014-08-25 14:39:29 +0200 |
|---|---|---|
| committer | Paweł Hajdan, Jr <phajdan.jr@chromium.org> | 2014-08-25 12:40:59 +0000 |
| commit | e8e762a3d4f51fc5d765cf23dd8d3f7d138d779c (patch) | |
| tree | 8d21f3c4a0f13aa1e4f587d4387eaba5c99c8117 /base/test/test_timeouts.cc | |
| parent | a4b8fb8fdb4580f847e54e1e59419aa8182809e7 (diff) | |
| download | chromium_src-e8e762a3d4f51fc5d765cf23dd8d3f7d138d779c.zip chromium_src-e8e762a3d4f51fc5d765cf23dd8d3f7d138d779c.tar.gz chromium_src-e8e762a3d4f51fc5d765cf23dd8d3f7d138d779c.tar.bz2 | |
Implement unit test specific test launcher timeout
BUG=402213
R=dalecurtis@chromium.org, jam@chromium.org
Review URL: https://codereview.chromium.org/476543004
Cr-Commit-Position: refs/heads/master@{#291673}
Diffstat (limited to 'base/test/test_timeouts.cc')
| -rw-r--r-- | base/test/test_timeouts.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc index 7392450..92bcf9b 100644 --- a/base/test/test_timeouts.cc +++ b/base/test/test_timeouts.cc @@ -72,6 +72,7 @@ int TestTimeouts::action_max_timeout_ms_ = 45000; int TestTimeouts::action_max_timeout_ms_ = 30000; #endif // NDEBUG +int TestTimeouts::test_launcher_unit_timeout_ms_ = 5000; int TestTimeouts::test_launcher_timeout_ms_ = 45000; // static @@ -98,12 +99,16 @@ void TestTimeouts::Initialize() { &action_max_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. CHECK(tiny_timeout_ms_ <= action_timeout_ms_); CHECK(action_timeout_ms_ <= action_max_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_); } |