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

Unified Diff: net/test/test_server_posix.cc

Issue 7744004: Avoid long test_server timeouts by using action_timeout_ms (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 3 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 | « net/test/test_server.cc ('k') | net/test/test_server_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/test_server_posix.cc
diff --git a/net/test/test_server_posix.cc b/net/test/test_server_posix.cc
index 2efc54fea196e725c5c74cc6e370190afe8f4fdf..12008244e9f85a2fb1eb8ee7358ad324ceca920f 100644
--- a/net/test/test_server_posix.cc
+++ b/net/test/test_server_posix.cc
@@ -136,7 +136,7 @@ bool TestServer::WaitToStart() {
file_util::ScopedFD child_fd_closer(child_fd_closer_.release());
base::TimeDelta remaining_time = base::TimeDelta::FromMilliseconds(
- TestTimeouts::action_max_timeout_ms());
+ TestTimeouts::action_timeout_ms());
uint32 server_data_len = 0;
if (!ReadData(child_fd_, sizeof(server_data_len),
« no previous file with comments | « net/test/test_server.cc ('k') | net/test/test_server_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698