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

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

Issue 74253002: Stop using third_party\python_26 for many tests. (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: the fix is so simple, it's not even funny Created 7 years, 1 month 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
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 bf1b0590786d683c2e3b768626c1b7a0e6c053db..fba2ff62a99cb8c8aafde76aa658233f68e71ce3 100644
--- a/net/test/spawned_test_server/local_test_server.cc
+++ b/net/test/spawned_test_server/local_test_server.cc
@@ -126,9 +126,15 @@ bool LocalTestServer::Stop() {
// First check if the process has already terminated.
bool ret = base::WaitForSingleProcess(process_handle_, base::TimeDelta());
- if (!ret)
+ if (!ret) {
+#if defined(OS_WIN)
Paweł Hajdan Jr. 2013/12/02 19:37:56 Let's close the job handle always when returning f
M-A Ruel 2013/12/02 20:13:16 and removed stale comment at lines 136-137.
+ job_handle_.Close();
+#endif
ret = base::KillProcess(process_handle_, 1, true);
+ }
+ // TODO(maruel): This doesn't work on Windows because it kills cmd.exe
+ // instead of python.exe. http://crbug.com/321703
if (ret) {
base::CloseProcessHandle(process_handle_);
process_handle_ = base::kNullProcessHandle;

Powered by Google App Engine
This is Rietveld 408576698