Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(706)

Unified Diff: chrome/browser/ui/login/login_handler_browsertest.cc

Issue 2371423002: Fix LoginPromptBrowserTest.TestCancelAuth_OnNavigation test flakiness. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/login/login_handler_browsertest.cc
diff --git a/chrome/browser/ui/login/login_handler_browsertest.cc b/chrome/browser/ui/login/login_handler_browsertest.cc
index fc05de5f8f2a5ab6ef4a480531a71a53072db95a..532374de43df374c944a8b01a0e451b66f0a06c4 100644
--- a/chrome/browser/ui/login/login_handler_browsertest.cc
+++ b/chrome/browser/ui/login/login_handler_browsertest.cc
@@ -348,15 +348,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth_Manual) {
EXPECT_TRUE(observer.handlers().empty());
}
-// Flaky on linux chromeos bots: crbug.com/648826.
-#if defined(OS_LINUX) && defined(OS_CHROMEOS)
-#define MAYBE_TestCancelAuth_OnNavigation DISABLED_TestCancelAuth_OnNavigation
-#else
-#define MAYBE_TestCancelAuth_OnNavigation TestCancelAuth_OnNavigation
-#endif
// Test login prompt cancellation on navigation to a new page.
-IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,
- MAYBE_TestCancelAuth_OnNavigation) {
+IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth_OnNavigation) {
ASSERT_TRUE(embedded_test_server()->Start());
const GURL kAuthURL = embedded_test_server()->GetURL(kAuthBasicPage);
const GURL kNoAuthURL = embedded_test_server()->GetURL(kNoAuthPage1);
@@ -367,8 +360,9 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,
LoginPromptBrowserTestObserver observer;
observer.Register(content::Source<NavigationController>(controller));
- // One LOAD_STOP event for kAuthURL and one for kNoAuthURL.
- const int kLoadStopEvents = 2;
+ // One LOAD_STOP event for LoginInterstitial, second for kAuthURL and third
+ // for kNoAuthURL.
+ const int kLoadStopEvents = 3;
WindowedLoadStopObserver load_stop_waiter(controller, kLoadStopEvents);
WindowedAuthNeededObserver auth_needed_waiter(controller);
browser()->OpenURL(OpenURLParams(kAuthURL, Referrer(),
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698