Give localserver time to shut down

net/test/spawned_test_server/local_test_server.cc

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..2dd5a3ebe1ee90ced714ebdc996ea9ab0bf64e59 100644
--- a/net/test/spawned_test_server/local_test_server.cc
+++ b/net/test/spawned_test_server/local_test_server.cc
@@ -127,13 +127,14 @@ bool LocalTestServer::Stop() {
 #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.
+  // Wait for the process to terminate.

[M-A Ruel, 2014/02/14 13:54:35]

processes

http://msdn.microsoft.com/library/windows/desktop/ms684161.aspx
" The state of a job object is set to signaled when all of its processes are
terminated because the specified end-of-job time limit has been exceeded. "

So do not wait for process_handle_, wait for job_handle_ to become signaled.

[sigbjorn, 2014/02/14 16:05:51]

Fixed
How do you propose to do this? job_handle is explicitly nulled in Close()

[M-A Ruel, 2014/02/14 20:14:37]

With TerminateJobObject(), since you obviously can't wait on a closed handle.
http://msdn.microsoft.com/library/windows/desktop/ms686709.aspx

[sigbjorn, 2014/02/17 12:50:40]

Done.

+  bool ret = base::WaitForSingleProcess(process_handle_,
+                                        base::TimeDelta::FromSeconds(60));
+#else
   bool ret = base::WaitForSingleProcess(process_handle_, base::TimeDelta());
-  if (!ret) {
+  if (!ret)
     ret = base::KillProcess(process_handle_, 1, true);

[M-A Ruel, 2014/02/14 13:54:35]

That doesn't compile.

[sigbjorn, 2014/02/14 16:05:51]

Which compiler and how?

[M-A Ruel, 2014/02/14 20:14:37]

Oh sorry, I missed the fact that you had removed { too.

-  }
+#endif
 
   if (ret) {
     base::CloseProcessHandle(process_handle_);