summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-03 03:14:01 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-03 03:14:01 +0000
commit1de71a4f741bc78e00dbb1da2b6419ce1b619562 (patch)
tree103f2d3932820f5570d253ef444b9ca7c32e6486
parentc7e5e94bd0112a8ede65dfcab222ba45e78a1b76 (diff)
downloadchromium_src-1de71a4f741bc78e00dbb1da2b6419ce1b619562.zip
chromium_src-1de71a4f741bc78e00dbb1da2b6419ce1b619562.tar.gz
chromium_src-1de71a4f741bc78e00dbb1da2b6419ce1b619562.tar.bz2
On posix platforms make sure the test server has shutdown and wait for it so
we don't leave around zombies that can then cause other problems by hosing the box. (the python server doesn't always spin down, hence the kill also) Review URL: http://codereview.chromium.org/20007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9067 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/url_request/url_request_unittest.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index fff11f3..9a71e5f 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -212,6 +212,11 @@ class BaseTestServer : public base::ProcessFilter,
if (process_handle_) {
#if defined(OS_WIN)
CloseHandle(process_handle_);
+#elif defined(OS_POSIX)
+ // Make sure the process has exited and clean up the process to avoid
+ // a zombie.
+ kill(process_handle_, SIGINT);
+ waitpid(process_handle_, 0, 0);
#endif
process_handle_ = NULL;
}