summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-26 21:57:25 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-26 21:57:25 +0000
commitc545958e6c3328dbd7a7bdb7ee3c95299ce8b0c9 (patch)
treecc203a04fa94a47b9c79aace51b873c7a0a0da7e /chrome
parent8837076beefaa87aee83da6cad2f9e4d8ada0420 (diff)
downloadchromium_src-c545958e6c3328dbd7a7bdb7ee3c95299ce8b0c9.zip
chromium_src-c545958e6c3328dbd7a7bdb7ee3c95299ce8b0c9.tar.gz
chromium_src-c545958e6c3328dbd7a7bdb7ee3c95299ce8b0c9.tar.bz2
Switch failing HistoryTester tests from DISABLED to FAILS
BUG=39785 TEST=VerifyHistoryLength* tests should be run. Review URL: http://codereview.chromium.org/2293001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48332 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/ui/history_uitest.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/test/ui/history_uitest.cc b/chrome/test/ui/history_uitest.cc
index 308713d..205f27d 100644
--- a/chrome/test/ui/history_uitest.cc
+++ b/chrome/test/ui/history_uitest.cc
@@ -44,11 +44,10 @@ TEST_F(HistoryTester, VerifyHistoryLength1) {
kTestCompleteSuccess, action_max_timeout_ms());
}
-// Disabled, http://crbug.com/39785.
-// TODO(yuzo): Fix the following flaky (hence disabled) tests.
-// These tests are flaky because automatic and user-initiated transitions are
+// TODO(yuzo): Fix the following failing tests. http://crbug.com/39785
+// These tests are broken because automatic and user-initiated transitions are
// distinguished based on the interval between page load and redirect.
-TEST_F(HistoryTester, DISABLED_VerifyHistoryLength2) {
+TEST_F(HistoryTester, FAILS_VerifyHistoryLength2) {
// Test the history length for the following page transitions.
// -open-> Page 2 -redirect-> Page 3.
@@ -60,8 +59,8 @@ TEST_F(HistoryTester, DISABLED_VerifyHistoryLength2) {
kTestCompleteSuccess, action_max_timeout_ms());
}
-// Disabled, http://crbug.com/39785.
-TEST_F(HistoryTester, DISABLED_VerifyHistoryLength3) {
+// Fails consistently: http://crbug.com/39785
+TEST_F(HistoryTester, FAILS_VerifyHistoryLength3) {
// Test the history length for the following page transitions.
// -open-> Page 4 -navigate_backward-> Page 3 -navigate_backward->Page 1
// -navigate_forward-> Page 3 -navigate_forward-> Page 4