diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 16:29:54 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 16:29:54 +0000 |
| commit | 5b3737004f6b90d8c7302edebc289a35f647dffd (patch) | |
| tree | 6ffccc0a515da401a363bc0697a0930105eeb6ef /net | |
| parent | 23563dc1e18506fb1b9f53dd1762c2c69ab8a0df (diff) | |
| download | chromium_src-5b3737004f6b90d8c7302edebc289a35f647dffd.zip chromium_src-5b3737004f6b90d8c7302edebc289a35f647dffd.tar.gz chromium_src-5b3737004f6b90d8c7302edebc289a35f647dffd.tar.bz2 | |
Avoid trying to kill a process that has already quit.
TEST=This is to reduce false positive "Unable to terminate process" log entries in unit tests.
BUG=none
Review URL: http://codereview.chromium.org/600108
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket/ssl_test_util.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/socket/ssl_test_util.cc b/net/socket/ssl_test_util.cc index 941b693..55d104c 100644 --- a/net/socket/ssl_test_util.cc +++ b/net/socket/ssl_test_util.cc @@ -341,7 +341,11 @@ bool TestServerLauncher::Stop() { if (!process_handle_) return true; - bool ret = base::KillProcess(process_handle_, 1, true); + // First check if the process has already terminated. + bool ret = base::WaitForSingleProcess(process_handle_, 0); + if (!ret) + ret = base::KillProcess(process_handle_, 1, true); + if (ret) { base::CloseProcessHandle(process_handle_); process_handle_ = base::kNullProcessHandle; |