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

Unified Diff: net/test/spawned_test_server/local_test_server.cc

Issue 145873004: Give localserver time to shut down (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Original code, using action_timeout Created 6 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/spawned_test_server/local_test_server.cc
diff --git a/net/test/spawned_test_server/local_test_server.cc b/net/test/spawned_test_server/local_test_server.cc
index 7ee12b99f69fc5032ea477c5ca8a1915547e835f..f8d63109e43661b930626ed7356a9fabda3f2dc9 100644
--- a/net/test/spawned_test_server/local_test_server.cc
+++ b/net/test/spawned_test_server/local_test_server.cc
@@ -10,6 +10,7 @@
#include "base/path_service.h"
#include "base/process/kill.h"
#include "base/strings/string_number_conversions.h"
+#include "base/test/test_timeouts.h"
#include "base/values.h"
#include "net/base/host_port_pair.h"
#include "net/base/net_errors.h"
@@ -130,10 +131,10 @@ bool LocalTestServer::Stop() {
#endif
// First check if the process has already terminated.
- bool ret = base::WaitForSingleProcess(process_handle_, base::TimeDelta());
- if (!ret) {
+ bool ret = base::WaitForSingleProcess(process_handle_,
+ TestTimeouts::action_timeout());
+ if (!ret)
ret = base::KillProcess(process_handle_, 1, true);
- }
if (ret) {
base::CloseProcessHandle(process_handle_);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698