From bfbe677d31356d7b21a8f02f8f4ca50e2119a214 Mon Sep 17 00:00:00 2001
From: "phajdan.jr@chromium.org"
<phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 7 Jun 2011 08:46:27 +0000
Subject: GTTF: Move --test-terminate-timeout logic to base/test/test_timeouts
This is the first step towards removing --test-terminate-timeout completely.
In this CL --test-terminate-timeout becomes a synonym for
--ui-test-action-max-timeout.
This makes it possible to switch callers to --ui-test-action-max-timeout
and remove --test-terminate-timeout.
Removing number of different kinds of timeouts makes it easier to pick one.
BUG=none
Review URL: http://codereview.chromium.org/7111035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88111 0039d316-1c4b-4281-b951-d872f2087c98
---
base/test/test_switches.cc | 2 ++
base/test/test_switches.h | 1 +
base/test/test_timeouts.cc | 2 ++
chrome/test/test_launcher_utils.cc | 16 ----------------
4 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/base/test/test_switches.cc b/base/test/test_switches.cc
index d4491ee..7116108 100644
--- a/base/test/test_switches.cc
+++ b/base/test/test_switches.cc
@@ -10,6 +10,8 @@ const char switches::kLiveOperationTimeout[] = "live-operation-timeout";
// Time (in milliseconds) that the tests should wait before timing out.
// TODO(phajdan.jr): Clean up the switch names.
const char switches::kTestLargeTimeout[] = "test-large-timeout";
+// TODO(phajdan.jr): 'Fix callers and remove --test-terminate-timeout.
+const char switches::kTestTerminateTimeout[] = "test-terminate-timeout";
const char switches::kTestTinyTimeout[] = "test-tiny-timeout";
const char switches::kUiTestActionTimeout[] = "ui-test-action-timeout";
const char switches::kUiTestActionMaxTimeout[] = "ui-test-action-max-timeout";
diff --git a/base/test/test_switches.h b/base/test/test_switches.h
index 81891cb6..5e4e8e2 100644
--- a/base/test/test_switches.h
+++ b/base/test/test_switches.h
@@ -11,6 +11,7 @@ namespace switches {
// alongside the definition of their values in the .cc file.
extern const char kLiveOperationTimeout[];
extern const char kTestLargeTimeout[];
+extern const char kTestTerminateTimeout[];
extern const char kTestTinyTimeout[];
extern const char kUiTestActionTimeout[];
extern const char kUiTestActionMaxTimeout[];
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index 6d7b96b..8de529d 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -66,6 +66,8 @@ void TestTimeouts::Initialize() {
&action_timeout_ms_);
InitializeTimeout(switches::kUiTestActionMaxTimeout, action_timeout_ms_,
&action_max_timeout_ms_);
+ // TODO(phajdan.jr): Fix callers and remove kTestTerminateTimeout.
+ InitializeTimeout(switches::kTestTerminateTimeout, &action_max_timeout_ms_);
InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_,
&large_test_timeout_ms_);
InitializeTimeout(switches::kUiTestTimeout, large_test_timeout_ms_,
diff --git a/chrome/test/test_launcher_utils.cc b/chrome/test/test_launcher_utils.cc
index 759267f..b9e6541 100644
--- a/chrome/test/test_launcher_utils.cc
+++ b/chrome/test/test_launcher_utils.cc
@@ -15,10 +15,6 @@
namespace {
-// TODO(phajdan.jr): remove this flag and fix its users.
-// We should use base/test/test_timeouts and not custom flags.
-static const char kTestTerminateTimeoutFlag[] = "test-terminate-timeout";
-
// A multiplier for slow tests. We generally avoid multiplying
// test timeouts by any constants. Here it is used as last resort
// to implement the SLOW_ test prefix.
@@ -94,18 +90,6 @@ bool OverrideGLImplementation(CommandLine* command_line,
int GetTestTerminationTimeout(const std::string& test_name,
int default_timeout_ms) {
int timeout_ms = default_timeout_ms;
- if (CommandLine::ForCurrentProcess()->HasSwitch(kTestTerminateTimeoutFlag)) {
- std::string timeout_str =
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- kTestTerminateTimeoutFlag);
- int timeout;
- if (base::StringToInt(timeout_str, &timeout)) {
- timeout_ms = std::max(timeout_ms, timeout);
- } else {
- LOG(ERROR) << "Invalid timeout (" << kTestTerminateTimeoutFlag << "): "
- << timeout_str;
- }
- }
// Make it possible for selected tests to request a longer timeout.
// Generally tests should really avoid doing too much, and splitting
--
cgit v1.1