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

Side by Side Diff: chrome_frame/test/test_with_web_server.cc

Issue 11316280: Disable CF web server tests temporarily on IE9 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Dear Greg. Created 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome_frame/test/test_with_web_server.h" 5 #include "chrome_frame/test/test_with_web_server.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/file_version_info.h" 8 #include "base/file_version_info.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 } 235 }
236 236
237 bool ChromeFrameTestWithWebServer::WaitForOnLoad(int milliseconds) { 237 bool ChromeFrameTestWithWebServer::WaitForOnLoad(int milliseconds) {
238 return false; 238 return false;
239 } 239 }
240 240
241 const wchar_t kPostedResultSubstring[] = L"/writefile/"; 241 const wchar_t kPostedResultSubstring[] = L"/writefile/";
242 242
243 void ChromeFrameTestWithWebServer::SimpleBrowserTestExpectedResult( 243 void ChromeFrameTestWithWebServer::SimpleBrowserTestExpectedResult(
244 BrowserKind browser, const wchar_t* page, const char* result) { 244 BrowserKind browser, const wchar_t* page, const char* result) {
245 if (browser == IE && chrome_frame_test::GetInstalledIEVersion() >= IE_9) {
246 LOG(INFO) << "Temporarily disabling IE9 web server tests. "
247 "See http://crbug.com/143699";
248 return;
249 }
250
245 int tries = 0; 251 int tries = 0;
246 ExpectAndHandlePostedResult(); 252 ExpectAndHandlePostedResult();
247 // Retry tests that timeout once; see http://crbug.com/96449. 253 // Retry tests that timeout once; see http://crbug.com/96449.
248 do { 254 do {
249 // NOTE: Failed ASSERTs cause this function to exit immediately. 255 // NOTE: Failed ASSERTs cause this function to exit immediately.
250 // Don't take a snapshot on the first try. 256 // Don't take a snapshot on the first try.
251 loop().set_snapshot_on_timeout(tries != 0); 257 loop().set_snapshot_on_timeout(tries != 0);
252 ASSERT_TRUE(LaunchBrowser(browser, page)); 258 ASSERT_TRUE(LaunchBrowser(browser, page));
253 if (WaitForTestToComplete(TestTimeouts::action_max_timeout())) { 259 if (WaitForTestToComplete(TestTimeouts::action_max_timeout())) {
254 // The test exited without timing out. Confirm that the expected response 260 // The test exited without timing out. Confirm that the expected response
(...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 server.web_server()->AddResponse(response); 1071 server.web_server()->AddResponse(response);
1066 1072
1067 std::wstring url(server.FormatHttpPath(L"form.html")); 1073 std::wstring url(server.FormatHttpPath(L"form.html"));
1068 1074
1069 ASSERT_TRUE(LaunchBrowser(IE, url.c_str())); 1075 ASSERT_TRUE(LaunchBrowser(IE, url.c_str()));
1070 loop().RunFor(kChromeFrameLongNavigationTimeout); 1076 loop().RunFor(kChromeFrameLongNavigationTimeout);
1071 1077
1072 EXPECT_EQ(1, response->get_request_count()); 1078 EXPECT_EQ(1, response->get_request_count());
1073 EXPECT_EQ(1, response->post_request_count()); 1079 EXPECT_EQ(1, response->post_request_count());
1074 } 1080 }
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