diff options
author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-13 00:09:47 +0000 |
---|---|---|
committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-13 00:09:47 +0000 |
commit | b40f8640305e66d937ba4df7cc6c6ae4aad6f141 (patch) | |
tree | 30457d27acd714080ac1ea9e01df040505feaea0 /chrome_frame/test/test_with_web_server.cc | |
parent | cfcc06ae4e543282647bb6ccb73bd333f3726f9a (diff) | |
download | chromium_src-b40f8640305e66d937ba4df7cc6c6ae4aad6f141.zip chromium_src-b40f8640305e66d937ba4df7cc6c6ae4aad6f141.tar.gz chromium_src-b40f8640305e66d937ba4df7cc6c6ae4aad6f141.tar.bz2 |
Reverting this as a number of tests have been failing on all builders ever since. Please look into this and resubmit.
Revert 47065 - An attempt to catch unexpected script errors in html test pages in a more generic way.
TEST=This is meant to help track down flakiness of a few tests.
BUG=none
Review URL: http://codereview.chromium.org/2052006
TBR=tommi@chromium.org
Review URL: http://codereview.chromium.org/2011017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/test_with_web_server.cc')
-rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index ba009c8..815ad86 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -158,7 +158,7 @@ bool ChromeFrameTestWithWebServer::WaitForOnLoad(int milliseconds) { } bool ChromeFrameTestWithWebServer::ReadResultFile(const std::wstring& file_name, - std::string* data) { + std::string* data) { std::wstring full_path = results_dir_; file_util::AppendToPath(&full_path, file_name); return file_util::ReadFileToString(full_path, data); @@ -171,8 +171,6 @@ bool ChromeFrameTestWithWebServer::CheckResultFile( if (ret) ret = (data == expected_result); - LogScriptErrorResultFile(); - if (!ret) { LOG(ERROR) << "Error text: " << (data.empty() ? "<empty>" : data.c_str()); } @@ -180,16 +178,6 @@ bool ChromeFrameTestWithWebServer::CheckResultFile( return ret; } -void ChromeFrameTestWithWebServer::LogScriptErrorResultFile() { - std::string data; - ReadResultFile(L"tester_helpers", &data); - if (!data.empty()) { - // Data will be set to the URL of the failing page. - LOG(ERROR) << "Script exception: " << data; - } -} - - void ChromeFrameTestWithWebServer::SimpleBrowserTest(BrowserKind browser, const wchar_t* page, const wchar_t* result_file_to_check) { ASSERT_TRUE(LaunchBrowser(browser, page)); |