summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 12:14:38 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 12:14:38 +0000
commit36b70104846c6bd306dae660c3b3266a4acf2c1c (patch)
tree3140930ab7c5b5045aecfc06e25e21c8ea017215 /chrome/browser
parentfc89d8ae5916652cce7a00f5adac4d0e812b5c16 (diff)
downloadchromium_src-36b70104846c6bd306dae660c3b3266a4acf2c1c.zip
chromium_src-36b70104846c6bd306dae660c3b3266a4acf2c1c.tar.gz
chromium_src-36b70104846c6bd306dae660c3b3266a4acf2c1c.tar.bz2
LoginPromptTest.TestBasicAuth is also flaky due to NavigateToURL failing
BUG=55380 TEST=LoginPromptTest.TestBasicAuth TBR=thomasvl@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/login_prompt_uitest.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/login_prompt_uitest.cc b/chrome/browser/login_prompt_uitest.cc
index 9912dd4..0a804bf6 100644
--- a/chrome/browser/login_prompt_uitest.cc
+++ b/chrome/browser/login_prompt_uitest.cc
@@ -51,8 +51,16 @@ wstring ExpectedTitleFromAuth(const wstring& username,
return username + L"/" + password;
}
+// http://crbug.com/55380 - NavigateToURL is making this flaky.
+#if defined(OS_WIN)
+#define MAYBE_TestBasicAuth FLAKY_TestBasicAuth
+#elif defined(OS_LINUX)
+#define MAYBE_TestBasicAuth FLAKY_TestBasicAuth
+#else
+#define MAYBE_TestBasicAuth TestBasicAuth
+#endif
// Test that "Basic" HTTP authentication works.
-TEST_F(LoginPromptTest, TestBasicAuth) {
+TEST_F(LoginPromptTest, MAYBE_TestBasicAuth) {
ASSERT_TRUE(test_server_.Start());
scoped_refptr<TabProxy> tab(GetActiveTab());