Speculative fix for the ChromeFrame IE8 random test failures. The tests which...

chrome_frame/test/test_with_web_server.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_frame/test/test_with_web_server.h"
 
 #include "base/base_paths.h"
 #include "base/file_version_info.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome_frame/utils.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
 #include "net/base/mime_util.h"
 
 using chrome_frame_test::kChromeFrameLongNavigationTimeoutInSeconds;
 using testing::_;
 using testing::StrCaseEq;
 
 const wchar_t kDocRoot[] = L"chrome_frame\\test\\data";
-const int kLongWaitTimeout = 60 * 1000;
-const int kShortWaitTimeout = 25 * 1000;
+const int kLongWaitTimeout = 15 * 1000;
+const int kShortWaitTimeout = 5 * 1000;
 
 namespace {
 
 // Helper method for creating the appropriate HTTP response headers.
 std::string CreateHttpHeaders(CFInvocation invocation,
                               bool add_no_cache_header,
                               const std::string& content_type) {
   std::ostringstream ss;
   ss << "HTTP/1.1 200 OK\r\n"
      << "Connection: close\r\n"
@@ skipping 159 matching lines @@
   if (!ret) {
     LOG(ERROR) << "Error text: " << (data.empty() ? "<empty>" : data.c_str());
   }
 
   return ret;
 }
 
 void ChromeFrameTestWithWebServer::SimpleBrowserTest(BrowserKind browser,
     const wchar_t* page, const wchar_t* result_file_to_check) {
   ASSERT_TRUE(LaunchBrowser(browser, page));
-  ASSERT_TRUE(WaitForTestToComplete(kLongWaitTimeout));
+  WaitForTestToComplete(kLongWaitTimeout);
   ASSERT_TRUE(CheckResultFile(result_file_to_check, "OK"));
 }
 
 void ChromeFrameTestWithWebServer::OptionalBrowserTest(BrowserKind browser,
     const wchar_t* page, const wchar_t* result_file_to_check) {
   DCHECK(browser != CHROME) << "Chrome tests shouldn't be optional";
   if (!LaunchBrowser(browser, page)) {
     LOG(ERROR) << "Failed to launch browser " << ToString(browser);
   } else {
-    ASSERT_TRUE(WaitForTestToComplete(kLongWaitTimeout));
+    WaitForTestToComplete(kLongWaitTimeout);
     ASSERT_TRUE(CheckResultFile(result_file_to_check, "OK"));
   }
 }
 
 void ChromeFrameTestWithWebServer::VersionTest(BrowserKind browser,
     const wchar_t* page, const wchar_t* result_file_to_check) {
   FilePath plugin_path;
   PathService::Get(base::DIR_MODULE, &plugin_path);
   plugin_path = plugin_path.AppendASCII("servers");
   plugin_path = plugin_path.Append(kChromeFrameDllName);
@@ skipping 19 matching lines @@
         ver_system ? ver_system->GetString() : ver_user->GetString());
     cf_dll_path = cf_dll_path.Append(kChromeFrameDllName);
     version_info = FileVersionInfo::CreateFileVersionInfo(cf_dll_path);
     if (version_info)
       version = version_info->product_version();
   }
 
   EXPECT_TRUE(version_info);
   EXPECT_FALSE(version.empty());
   EXPECT_TRUE(LaunchBrowser(browser, page));
-  ASSERT_TRUE(WaitForTestToComplete(kLongWaitTimeout));
+  WaitForTestToComplete(kLongWaitTimeout);
   ASSERT_TRUE(CheckResultFile(result_file_to_check, WideToUTF8(version)));
 }
 
 // MockWebServer methods
 void MockWebServer::ExpectAndServeRequest(CFInvocation invocation,
                                           const std::wstring& url) {
   EXPECT_CALL(*this, Get(_, chrome_frame_test::UrlPathEq(url), _))
       .WillOnce(SendResponse(this, invocation));
 }
 
@@ skipping 718 matching lines @@
   chrome_frame_test::TimedMsgLoop loop;
   ASSERT_TRUE(LaunchBrowser(IE, kXHRConditionalHeaderTestUrl));
 
   loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
 
   chrome_frame_test::CloseAllIEWindows();
   ASSERT_TRUE(CheckResultFile(L"FullTab_XMLHttpRequestConditionalHeaderTest",
                               "OK"));
 }