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

Unified Diff: chrome_frame/test/test_with_web_server.cc

Issue 10868027: Attempt to fix flake in FullTabModeIE_TestPostReissue by avoiding loopback address. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: another try with net tests Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/test_with_web_server.h ('k') | chrome_frame/test/url_request_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/test_with_web_server.cc
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index a6118e68b6771fc75c0ac28db398bc361a3bccb8..baf4c6bd28e397b76c3e4430940305dea6353b84 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -78,6 +78,7 @@ FilePath ChromeFrameTestWithWebServer::CFInstance_path_;
ScopedTempDir ChromeFrameTestWithWebServer::temp_dir_;
FilePath ChromeFrameTestWithWebServer::chrome_user_data_dir_;
chrome_frame_test::TimedMsgLoop* ChromeFrameTestWithWebServer::loop_;
+std::string ChromeFrameTestWithWebServer::local_address_;
testing::StrictMock<MockWebServerListener>*
ChromeFrameTestWithWebServer::listener_mock_;
testing::StrictMock<MockWebServer>* ChromeFrameTestWithWebServer::server_mock_;
@@ -115,9 +116,10 @@ void ChromeFrameTestWithWebServer::SetUpTestCase() {
loop_ = new chrome_frame_test::TimedMsgLoop();
loop_->set_snapshot_on_timeout(true);
+ local_address_ = chrome_frame_test::GetLocalIPv4Address();
listener_mock_ = new testing::StrictMock<MockWebServerListener>();
server_mock_ = new testing::StrictMock<MockWebServer>(
- 1337, ASCIIToWide(chrome_frame_test::GetLocalIPv4Address()),
+ 1337, ASCIIToWide(local_address_),
chrome_frame_test::GetTestDataFolder());
server_mock_->set_listener(listener_mock_);
}
@@ -128,6 +130,7 @@ void ChromeFrameTestWithWebServer::TearDownTestCase() {
server_mock_ = NULL;
delete listener_mock_;
listener_mock_ = NULL;
+ local_address_.clear();
delete loop_;
loop_ = NULL;
file_util::Delete(CFInstall_path_, false);
@@ -759,7 +762,7 @@ TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_TestPostReissue) {
L"chrome_frame_tester_helpers.js",
};
- SimpleWebServerTest server(46664);
+ SimpleWebServerTest server(local_address_, 46664);
server.PopulateStaticFileListT<test_server::FileResponse>(kPages,
arraysize(kPages), GetCFTestFilePath());
@@ -790,7 +793,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestMultipleGet) {
L"chrome_frame_tester_helpers.js",
};
- SimpleWebServerTest server(46664);
+ SimpleWebServerTest server(local_address_, 46664);
server.PopulateStaticFileListT<test_server::FileResponse>(kPages,
arraysize(kPages), GetCFTestFilePath());
@@ -908,7 +911,7 @@ TEST_F(ChromeFrameTestWithWebServer, FAILS_FullTabModeIE_RefreshMshtmlTest) {
L"mshtml_refresh_test_popup.html",
};
- SimpleWebServerTest server(46664);
+ SimpleWebServerTest server(local_address_, 46664);
server.PopulateStaticFileListT<UaTemplateFileResponse>(kPages,
arraysize(kPages), GetCFTestFilePath());
@@ -1048,7 +1051,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestDownloadFromForm) {
.Times(testing::AtMost(1))
.WillOnce(QUIT_LOOP(loop()));
- SimpleWebServerTest server(46664);
+ SimpleWebServerTest server(local_address_, 46664);
CustomResponse* response = new CustomResponse("/form.html");
server.web_server()->AddResponse(response);
« no previous file with comments | « chrome_frame/test/test_with_web_server.h ('k') | chrome_frame/test/url_request_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698