diff options
| author | sigbjorn@opera.com <sigbjorn@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 18:17:43 +0000 |
|---|---|---|
| committer | sigbjorn@opera.com <sigbjorn@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 18:17:43 +0000 |
| commit | 21ac3ce913f56b00f9cd236064a3287da6b5f9cd (patch) | |
| tree | 55323822d92577217497e94f81494710d2166996 | |
| parent | f478f57b20a4b194638a9bdca70a0ee89bfd3583 (diff) | |
| download | chromium_src-21ac3ce913f56b00f9cd236064a3287da6b5f9cd.zip chromium_src-21ac3ce913f56b00f9cd236064a3287da6b5f9cd.tar.gz chromium_src-21ac3ce913f56b00f9cd236064a3287da6b5f9cd.tar.bz2 | |
Give localserver time to shut down
On machines with slow I/O, the localserver might not shut down immediately,
wait for it if necessary.
BUG=
Review URL: https://codereview.chromium.org/145873004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260201 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/test/spawned_test_server/local_test_server.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/test/spawned_test_server/local_test_server.cc b/net/test/spawned_test_server/local_test_server.cc index 6516136..ee86d74 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" @@ -126,6 +127,10 @@ bool LocalTestServer::Stop() { #if defined(OS_WIN) // This kills all the processes in the job object. + TerminateJobObject(job_handle_.Get(), 1); + // This is done asynchronously so wait a bit for the processes to be killed. + WaitForSingleObject(job_handle_.Get(), + TestTimeouts::action_timeout().InMilliseconds()); job_handle_.Close(); #endif |