summaryrefslogtreecommitdiffstats
path: root/chrome/browser/errorpage_uitest.cc
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-13 03:25:09 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-13 03:25:09 +0000
commit969a7b97029963ba6c6dd1456132d844160b5ad0 (patch)
treeb5b7547c3cf7a72c10af0648670bd3fd5b1043b5 /chrome/browser/errorpage_uitest.cc
parentfb4c6a88fe584d0bc11507023b208a210b80a71f (diff)
downloadchromium_src-969a7b97029963ba6c6dd1456132d844160b5ad0.zip
chromium_src-969a7b97029963ba6c6dd1456132d844160b5ad0.tar.gz
chromium_src-969a7b97029963ba6c6dd1456132d844160b5ad0.tar.bz2
re-enable ErrorPage UI tests.
They are fixed now and can be re-enabled. BUG=32125 TBR=johnnyg Review URL: http://codereview.chromium.org/542047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/errorpage_uitest.cc')
-rw-r--r--chrome/browser/errorpage_uitest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc
index 174ffc1..6c1f34f 100644
--- a/chrome/browser/errorpage_uitest.cc
+++ b/chrome/browser/errorpage_uitest.cc
@@ -52,7 +52,7 @@ TEST_F(ErrorPageTest, FLAKY_DNSError_GoBack1) {
}
// Flaky, http://crbug.com/19361.
-TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2) {
+TEST_F(ErrorPageTest, FLAKY_DNSError_GoBack2) {
// Test that a DNS error occuring in the main frame does not result in an
// additional session history entry.
GURL test_url(URLRequestFailedDnsJob::kTestUrl);
@@ -76,7 +76,7 @@ TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2) {
}
// Flaky, http://crbug.com/19361.
-TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2AndForward) {
+TEST_F(ErrorPageTest, FLAKY_DNSError_GoBack2AndForward) {
// Test that a DNS error occuring in the main frame does not result in an
// additional session history entry.
@@ -104,7 +104,7 @@ TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2AndForward) {
}
// Flaky, http://crbug.com/19361.
-TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2Forward2) {
+TEST_F(ErrorPageTest, FLAKY_DNSError_GoBack2Forward2) {
// Test that a DNS error occuring in the main frame does not result in an
// additional session history entry.