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

Side by Side Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 8962040: Mark SSLUITest.TestHTTPSExpiredCertAndGoBackViaButton flaky. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/time.h" 6 #include "base/time.h"
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/tabs/tab_strip_model.h" 8 #include "chrome/browser/tabs/tab_strip_model.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_navigator.h" 10 #include "chrome/browser/ui/browser_navigator.h"
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 // We should be back to the original good page. 345 // We should be back to the original good page.
346 CheckAuthenticatedState(tab, false); 346 CheckAuthenticatedState(tab, false);
347 347
348 // Try to navigate to a new page. (to make sure bug 5800 is fixed). 348 // Try to navigate to a new page. (to make sure bug 5800 is fixed).
349 ui_test_utils::NavigateToURL(browser(), 349 ui_test_utils::NavigateToURL(browser(),
350 test_server()->GetURL("files/ssl/google.html")); 350 test_server()->GetURL("files/ssl/google.html"));
351 CheckUnauthenticatedState(tab); 351 CheckUnauthenticatedState(tab);
352 } 352 }
353 353
354 // Visits a page with https error and then goes back using Browser::GoBack. 354 // Visits a page with https error and then goes back using Browser::GoBack.
355 IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndGoBackViaButton) { 355 // Marked as flaky, see bug 40932.
356 IN_PROC_BROWSER_TEST_F(SSLUITest,
357 FLAKY_TestHTTPSExpiredCertAndGoBackViaButton) {
356 ASSERT_TRUE(test_server()->Start()); 358 ASSERT_TRUE(test_server()->Start());
357 ASSERT_TRUE(https_server_expired_.Start()); 359 ASSERT_TRUE(https_server_expired_.Start());
358 360
359 // First navigate to an HTTP page. 361 // First navigate to an HTTP page.
360 ui_test_utils::NavigateToURL(browser(), 362 ui_test_utils::NavigateToURL(browser(),
361 test_server()->GetURL("files/ssl/google.html")); 363 test_server()->GetURL("files/ssl/google.html"));
362 TabContents* tab = browser()->GetSelectedTabContents(); 364 TabContents* tab = browser()->GetSelectedTabContents();
363 NavigationEntry* entry = tab->GetController().GetActiveEntry(); 365 NavigationEntry* entry = tab->GetController().GetActiveEntry();
364 ASSERT_TRUE(entry); 366 ASSERT_TRUE(entry);
365 367
(...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after
1323 1325
1324 // Visit a page over https that contains a frame with a redirect. 1326 // Visit a page over https that contains a frame with a redirect.
1325 1327
1326 // XMLHttpRequest insecure content in synchronous mode. 1328 // XMLHttpRequest insecure content in synchronous mode.
1327 1329
1328 // XMLHttpRequest insecure content in asynchronous mode. 1330 // XMLHttpRequest insecure content in asynchronous mode.
1329 1331
1330 // XMLHttpRequest over bad ssl in synchronous mode. 1332 // XMLHttpRequest over bad ssl in synchronous mode.
1331 1333
1332 // XMLHttpRequest over OK ssl in synchronous mode. 1334 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW
« 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