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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/test/test_server.cc ('k') | net/test/test_server_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/test/test_server.h" 5 #include "net/test/test_server.h"
6 6
7 #include <poll.h> 7 #include <poll.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 return false; 129 return false;
130 } 130 }
131 131
132 return true; 132 return true;
133 } 133 }
134 134
135 bool TestServer::WaitToStart() { 135 bool TestServer::WaitToStart() {
136 file_util::ScopedFD child_fd_closer(child_fd_closer_.release()); 136 file_util::ScopedFD child_fd_closer(child_fd_closer_.release());
137 137
138 base::TimeDelta remaining_time = base::TimeDelta::FromMilliseconds( 138 base::TimeDelta remaining_time = base::TimeDelta::FromMilliseconds(
139 TestTimeouts::action_max_timeout_ms()); 139 TestTimeouts::action_timeout_ms());
140 140
141 uint32 server_data_len = 0; 141 uint32 server_data_len = 0;
142 if (!ReadData(child_fd_, sizeof(server_data_len), 142 if (!ReadData(child_fd_, sizeof(server_data_len),
143 reinterpret_cast<uint8*>(&server_data_len), 143 reinterpret_cast<uint8*>(&server_data_len),
144 &remaining_time)) { 144 &remaining_time)) {
145 LOG(ERROR) << "Could not read server_data_len"; 145 LOG(ERROR) << "Could not read server_data_len";
146 return false; 146 return false;
147 } 147 }
148 std::string server_data(server_data_len, '\0'); 148 std::string server_data(server_data_len, '\0');
149 if (!ReadData(child_fd_, server_data_len, 149 if (!ReadData(child_fd_, server_data_len,
150 reinterpret_cast<uint8*>(&server_data[0]), 150 reinterpret_cast<uint8*>(&server_data[0]),
151 &remaining_time)) { 151 &remaining_time)) {
152 LOG(ERROR) << "Could not read server_data (" << server_data_len 152 LOG(ERROR) << "Could not read server_data (" << server_data_len
153 << " bytes)"; 153 << " bytes)";
154 return false; 154 return false;
155 } 155 }
156 156
157 if (!ParseServerData(server_data)) { 157 if (!ParseServerData(server_data)) {
158 LOG(ERROR) << "Could not parse server_data: " << server_data; 158 LOG(ERROR) << "Could not parse server_data: " << server_data;
159 return false; 159 return false;
160 } 160 }
161 161
162 return true; 162 return true;
163 } 163 }
164 164
165 } // namespace net 165 } // namespace net
OLDNEW
« 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