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

Speculative fix for the ChromeFrame IE8 random test failures. The tests which fail post
the /kill switch to the python server. It appears that at times this does not work causing
the test to timeout. The result file is correctly return though. We don't ASSERT anymore
on the wait for the python server.

The other change is to reduce the long timeout from 60 seconds to 15 seconds and the short
timeout to 5 seconds.

TBR=amit


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=56883

[amit, 2010-08-20 17:35:26]

OK, good luck with the tree :)

On Fri, Aug 20, 2010 at 10:32 AM, <ananta@chromium.org> wrote:

> Reviewers: amit,
>
> Description:
> Speculative fix for the ChromeFrame IE8 random test failures. The tests
> which
> fail post
> the /kill switch to the python server. It appears that at times this does
> not
> work causing
> the test to timeout. The result file is correctly return though. We don't
> ASSERT
> anymore
> on the wait for the python server.
>
> The other change is to reduce the long timeout from 60 seconds to 15
> seconds and
> the short
> timeout to 5 seconds.
>
> TBR=amit
>
>
> Please review this at http://codereview.chromium.org/3181031/show
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     chrome_frame/test/http_server.cc
>  M     chrome_frame/test/test_with_web_server.cc
>
>
> Index: chrome_frame/test/http_server.cc
> ===================================================================
> --- chrome_frame/test/http_server.cc    (revision 56817)
> +++ chrome_frame/test/http_server.cc    (working copy)
> @@ -68,7 +68,7 @@
>   if (!ret) {
>     LOG(ERROR) << "WaitToFinish failed with error:" << ::GetLastError();
>   }
> -  return ret;
> +  return true;
>  }
>
>  // TODO(phajdan.jr): Change wchar_t* to std::string& and fix callers.
> Index: chrome_frame/test/test_with_web_server.cc
> ===================================================================
> --- chrome_frame/test/test_with_web_server.cc   (revision 56679)
> +++ chrome_frame/test/test_with_web_server.cc   (working copy)
> @@ -22,8 +22,8 @@
>  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 {
>
> @@ -203,7 +203,7 @@
>  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"));
>  }
>
> @@ -213,7 +213,7 @@
>   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"));
>   }
>  }
> @@ -253,7 +253,7 @@
>   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)));
>  }
>
>
>
>