diff options
| -rw-r--r-- | base/test/test_timeouts.cc | 6 | ||||
| -rw-r--r-- | base/test/test_timeouts.h | 6 | ||||
| -rw-r--r-- | chrome/browser/service/service_process_control_browsertest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/automation/proxy_launcher.cc | 4 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc | 2 | ||||
| -rwxr-xr-x | tools/heapcheck/chrome_tests.py | 3 | ||||
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 3 |
7 files changed, 6 insertions, 20 deletions
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc index 1d86b2c..6d7b96b 100644 --- a/base/test/test_timeouts.cc +++ b/base/test/test_timeouts.cc @@ -49,9 +49,6 @@ int TestTimeouts::large_test_timeout_ms_ = 3 * 60 * 1000; int TestTimeouts::huge_test_timeout_ms_ = 10 * 60 * 1000; // static -int TestTimeouts::wait_for_terminate_timeout_ms_ = 15000; - -// static int TestTimeouts::live_operation_timeout_ms_ = 45000; // static @@ -80,9 +77,6 @@ void TestTimeouts::Initialize() { CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_); CHECK(large_test_timeout_ms_ <= huge_test_timeout_ms_); - InitializeTimeout(switches::kUiTestTerminateTimeout, - &wait_for_terminate_timeout_ms_); - InitializeTimeout(switches::kLiveOperationTimeout, &live_operation_timeout_ms_); } diff --git a/base/test/test_timeouts.h b/base/test/test_timeouts.h index 64df11a..67b81b0 100644 --- a/base/test/test_timeouts.h +++ b/base/test/test_timeouts.h @@ -35,11 +35,6 @@ class TestTimeouts { // Do not use multiple times in a single test. static int huge_test_timeout_ms() { return huge_test_timeout_ms_; } - // Timeout to wait for a process to terminate. - static int wait_for_terminate_timeout_ms() { - return wait_for_terminate_timeout_ms_; - } - // Timeout to wait for a live operation to complete. Used by tests that access // external services. static int live_operation_timeout_ms() { @@ -54,7 +49,6 @@ class TestTimeouts { static int action_max_timeout_ms_; static int large_test_timeout_ms_; static int huge_test_timeout_ms_; - static int wait_for_terminate_timeout_ms_; static int live_operation_timeout_ms_; DISALLOW_IMPLICIT_CONSTRUCTORS(TestTimeouts); diff --git a/chrome/browser/service/service_process_control_browsertest.cc b/chrome/browser/service/service_process_control_browsertest.cc index b75ec4a..96ad827 100644 --- a/chrome/browser/service/service_process_control_browsertest.cc +++ b/chrome/browser/service/service_process_control_browsertest.cc @@ -74,7 +74,7 @@ class ServiceProcessControlBrowserTest void WaitForShutdown() { EXPECT_TRUE(base::WaitForSingleProcess( service_process_handle_, - TestTimeouts::wait_for_terminate_timeout_ms())); + TestTimeouts::action_max_timeout_ms())); } void ProcessControlLaunched() { diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc index 256add6..6260b94 100644 --- a/chrome/test/automation/proxy_launcher.cc +++ b/chrome/test/automation/proxy_launcher.cc @@ -302,7 +302,7 @@ void ProxyLauncher::QuitBrowser() { // been closed. int exit_code = -1; EXPECT_TRUE(WaitForBrowserProcessToQuit( - TestTimeouts::wait_for_terminate_timeout_ms(), &exit_code)); + TestTimeouts::action_max_timeout_ms(), &exit_code)); EXPECT_EQ(0, exit_code); // Expect a clean shutdown. browser_quit_time_ = base::TimeTicks::Now() - quit_start; @@ -334,7 +334,7 @@ void ProxyLauncher::TerminateBrowser() { int exit_code = -1; EXPECT_TRUE(WaitForBrowserProcessToQuit( - TestTimeouts::wait_for_terminate_timeout_ms(), &exit_code)); + TestTimeouts::action_max_timeout_ms(), &exit_code)); EXPECT_EQ(0, exit_code); // Expect a clean shutdown. browser_quit_time_ = base::TimeTicks::Now() - quit_start; diff --git a/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc b/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc index e240d13..59e3ad2 100644 --- a/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc +++ b/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc @@ -58,6 +58,6 @@ TEST_F(FastShutdown, MAYBE_SlowTermination) { int exit_code = -1; ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit( - TestTimeouts::wait_for_terminate_timeout_ms(), &exit_code)); + TestTimeouts::action_max_timeout_ms(), &exit_code)); EXPECT_EQ(0, exit_code); // Expect a clean shutdown. } diff --git a/tools/heapcheck/chrome_tests.py b/tools/heapcheck/chrome_tests.py index c3fc592..ad4a386 100755 --- a/tools/heapcheck/chrome_tests.py +++ b/tools/heapcheck/chrome_tests.py @@ -304,8 +304,7 @@ class ChromeTests(object): return self.SimpleTest("chrome", "ui_tests", cmd_args=[ "--ui-test-action-timeout=80000", - "--ui-test-action-max-timeout=180000", - "--ui-test-terminate-timeout=60000"]) + "--ui-test-action-max-timeout=180000"]) def TestLayoutChunk(self, chunk_num, chunk_size): '''Runs tests [chunk_num*chunk_size .. (chunk_num+1)*chunk_size). diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index fb45f55..8662c23 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -273,8 +273,7 @@ class ChromeTests: UI_VALGRIND_ARGS = ["--timeout=7200", "--trace_children", "--indirect"] # UI test timeouts are in milliseconds. UI_TEST_ARGS = ["--ui-test-action-timeout=120000", - "--ui-test-action-max-timeout=280000", - "--ui-test-terminate-timeout=120000"] + "--ui-test-action-max-timeout=280000"] def TestUI(self): return self.SimpleTest("chrome", "ui_tests", valgrind_test_args=self.UI_VALGRIND_ARGS, |