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

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

Issue 7185030: Disabling FLAKY_TestUnauthenticatedFrameNavigation as it's timing out, like on other platforms (Closed)
Patch Set: Created 9 years, 6 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 unified diff | Download patch
« 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 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after
1020 EXPECT_TRUE(success); 1020 EXPECT_TRUE(success);
1021 ui_test_utils::WaitForNavigation(&tab->controller()); 1021 ui_test_utils::WaitForNavigation(&tab->controller());
1022 1022
1023 // We should still be authentication broken. 1023 // We should still be authentication broken.
1024 CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, 1024 CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false,
1025 false); 1025 false);
1026 } 1026 }
1027 1027
1028 // From an HTTP top frame, navigate to good and bad HTTPS (security state should 1028 // From an HTTP top frame, navigate to good and bad HTTPS (security state should
1029 // stay unauthenticated). 1029 // stay unauthenticated).
1030 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) 1030 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
1031 defined(OS_MAC)
Paweł Hajdan Jr. 2011/06/17 08:37:52 Isn't it OS_MACOSX? Anyway, let's stop this nonsen
1031 // Disabled, flakily exceeds test timeout, http://crbug.com/43437. 1032 // Disabled, flakily exceeds test timeout, http://crbug.com/43437.
1032 #define MAYBE_TestUnauthenticatedFrameNavigation \ 1033 #define MAYBE_TestUnauthenticatedFrameNavigation \
1033 DISABLED_TestUnauthenticatedFrameNavigation 1034 DISABLED_TestUnauthenticatedFrameNavigation
1034 #else 1035 #else
1035 // Marked as flaky, see bug 40932. 1036 // Marked as flaky, see bug 40932.
1036 #define MAYBE_TestUnauthenticatedFrameNavigation \ 1037 #define MAYBE_TestUnauthenticatedFrameNavigation \
1037 FLAKY_TestUnauthenticatedFrameNavigation 1038 FLAKY_TestUnauthenticatedFrameNavigation
1038 #endif 1039 #endif
1039 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestUnauthenticatedFrameNavigation) { 1040 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestUnauthenticatedFrameNavigation) {
1040 ASSERT_TRUE(test_server()->Start()); 1041 ASSERT_TRUE(test_server()->Start());
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
1176 1177
1177 // Visit a page over https that contains a frame with a redirect. 1178 // Visit a page over https that contains a frame with a redirect.
1178 1179
1179 // XMLHttpRequest insecure content in synchronous mode. 1180 // XMLHttpRequest insecure content in synchronous mode.
1180 1181
1181 // XMLHttpRequest insecure content in asynchronous mode. 1182 // XMLHttpRequest insecure content in asynchronous mode.
1182 1183
1183 // XMLHttpRequest over bad ssl in synchronous mode. 1184 // XMLHttpRequest over bad ssl in synchronous mode.
1184 1185
1185 // XMLHttpRequest over OK ssl in synchronous mode. 1186 // 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