summaryrefslogtreecommitdiffstats
path: root/chrome/browser/errorpage_uitest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-19 15:07:18 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-19 15:07:18 +0000
commit6aa8dcb15ffc65b650eaa201babf19690fbffd57 (patch)
treebaf46b5c8b0008d39e0c92f26dc63dffacbb72f1 /chrome/browser/errorpage_uitest.cc
parent63871741d4b48d1a9bf757ffe2a90f85dda711f0 (diff)
downloadchromium_src-6aa8dcb15ffc65b650eaa201babf19690fbffd57.zip
chromium_src-6aa8dcb15ffc65b650eaa201babf19690fbffd57.tar.gz
chromium_src-6aa8dcb15ffc65b650eaa201babf19690fbffd57.tar.bz2
Add automation call to wait for multiple navigations.
Convert one ErrorPage UI test to use it. The rest of the tests will require more work. TEST=Covered by ui_tests. http://crbug.com/19361, http://crbug.com/19395 Review URL: http://codereview.chromium.org/174015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/errorpage_uitest.cc')
-rw-r--r--chrome/browser/errorpage_uitest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc
index fda144d..8a4c3a0 100644
--- a/chrome/browser/errorpage_uitest.cc
+++ b/chrome/browser/errorpage_uitest.cc
@@ -30,11 +30,10 @@ class ErrorPageTest : public UITest {
}
};
-// Flaky, see http://crbug.com/19361 and http://crbug.com/19395.
-TEST_F(ErrorPageTest, DISABLED_DNSError_Basic) {
+TEST_F(ErrorPageTest, DNSError_Basic) {
GURL test_url(URLRequestFailedDnsJob::kTestUrl);
- NavigateToURL(test_url);
+ NavigateToURLBlockUntilNavigationsComplete(test_url, 2);
EXPECT_TRUE(WaitForTitleContaining(test_url.host()));
}