summaryrefslogtreecommitdiffstats
path: root/chrome/common/process_watcher_unittest.cc
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-13 16:53:56 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-13 16:53:56 +0000
commit71c311bb926357af4adea1eb4206c3455be69c29 (patch)
tree66a7ab2c7767d1060e5e8fe5e4e33885651c3708 /chrome/common/process_watcher_unittest.cc
parentc08503001980b9f5f913ab9f83542fcab7e38a66 (diff)
downloadchromium_src-71c311bb926357af4adea1eb4206c3455be69c29.zip
chromium_src-71c311bb926357af4adea1eb4206c3455be69c29.tar.gz
chromium_src-71c311bb926357af4adea1eb4206c3455be69c29.tar.bz2
Mac: ensure child processes are properly reaped -- eliminate Helper zombies.
BUG=32001 TEST=Surf a lot. Then close all Chrome/Chromium windows. Make sure there aren't any zombie Chrome/Chromium Helper processes (run "ps -Al" and look for things with status containing 'Z'). Review URL: http://codereview.chromium.org/542042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/process_watcher_unittest.cc')
-rw-r--r--chrome/common/process_watcher_unittest.cc18
1 files changed, 17 insertions, 1 deletions
diff --git a/chrome/common/process_watcher_unittest.cc b/chrome/common/process_watcher_unittest.cc
index 505a468..af4aaa2 100644
--- a/chrome/common/process_watcher_unittest.cc
+++ b/chrome/common/process_watcher_unittest.cc
@@ -39,10 +39,26 @@ TEST_F(ProcessWatcherTest, DelayedTermination) {
}
MULTIPROCESS_TEST_MAIN(process_watcher_test_never_die) {
- while(1){
+ while (1) {
sleep(500);
}
return 0;
}
+TEST_F(ProcessWatcherTest, ImmediateTermination) {
+ base::ProcessHandle child_process =
+ SpawnChild(L"process_watcher_test_die_immediately");
+ // Give it time to die.
+ sleep(2);
+ ProcessWatcher::EnsureProcessTerminated(child_process);
+
+ // Check that process was really killed.
+ EXPECT_TRUE(IsProcessDead(child_process));
+ base::CloseProcessHandle(child_process);
+}
+
+MULTIPROCESS_TEST_MAIN(process_watcher_test_die_immediately) {
+ return 0;
+}
+
#endif // OS_POSIX