summaryrefslogtreecommitdiffstats
path: root/net/test
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 00:18:28 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 00:18:28 +0000
commit0ae7c90f0e6ddefacba9bdc1659a408185de7700 (patch)
tree09823e1eb0ecc61495d10078bbbef848919ad7e7 /net/test
parentf66a50a51caad37a29fd51eb26b14d96cc9f51eb (diff)
downloadchromium_src-0ae7c90f0e6ddefacba9bdc1659a408185de7700.zip
chromium_src-0ae7c90f0e6ddefacba9bdc1659a408185de7700.tar.gz
chromium_src-0ae7c90f0e6ddefacba9bdc1659a408185de7700.tar.bz2
Restore test server launch timeout to 45 secs.
To see if it is just taking a long time or if there is a more serious problem. BUG=102725 Review URL: http://codereview.chromium.org/8386067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
-rw-r--r--net/test/test_server_win.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/test/test_server_win.cc b/net/test/test_server_win.cc
index d6eb7e7..93223e4 100644
--- a/net/test/test_server_win.cc
+++ b/net/test/test_server_win.cc
@@ -52,7 +52,7 @@ bool ReadData(HANDLE read_fd, HANDLE write_fd,
thread.message_loop()->PostDelayedTask(
FROM_HERE,
NewRunnableFunction(UnblockPipe, write_fd, bytes_max, &unblocked),
- TestTimeouts::action_timeout_ms());
+ 45000);
DWORD bytes_read = 0;
while (bytes_read < bytes_max) {
@@ -160,7 +160,6 @@ bool TestServer::WaitToStart() {
if (!ReadData(read_fd.Get(), write_fd.Get(), sizeof(server_data_len),
reinterpret_cast<uint8*>(&server_data_len))) {
LOG(ERROR) << "Could not read server_data_len";
- DebugBreakProcess(process_handle_);
return false;
}
std::string server_data(server_data_len, '\0');