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

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: Revert build/android/pylib/chrome_test_server_spawner.py so I can commit today Created 7 years 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/python_utils.cc ('k') | net/test/spawned_test_server/local_test_server_win.cc » ('j') | 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 bf1b0590786d683c2e3b768626c1b7a0e6c053db..8679d7b1554ff233390349fdf0607c62b92052e9 100644
--- a/net/test/spawned_test_server/local_test_server.cc
+++ b/net/test/spawned_test_server/local_test_server.cc
@@ -124,10 +124,16 @@ bool LocalTestServer::Stop() {
if (!process_handle_)
return true;
+#if defined(OS_WIN)
+ // This kills all the processes in the job object.
+ job_handle_.Close();
+#endif
+
// First check if the process has already terminated.
bool ret = base::WaitForSingleProcess(process_handle_, base::TimeDelta());
- if (!ret)
+ if (!ret) {
ret = base::KillProcess(process_handle_, 1, true);
+ }
if (ret) {
base::CloseProcessHandle(process_handle_);
« no previous file with comments | « net/test/python_utils.cc ('k') | net/test/spawned_test_server/local_test_server_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698