diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-03-20 14:25:15 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-03-20 14:41:11 +0100 |
| commit | 1ef206524de589efeeef0544afbf7bfb37d99c15 (patch) | |
| tree | 1d4dbdec8d8ba5dfad594c79e2b08b399fef5806 | |
| parent | 3a6133d70202ef80ead4203740c000be5e93b288 (diff) | |
| download | samba-1ef206524de589efeeef0544afbf7bfb37d99c15.tar.gz samba-1ef206524de589efeeef0544afbf7bfb37d99c15.tar.bz2 samba-1ef206524de589efeeef0544afbf7bfb37d99c15.zip | |
selftest/Samba3: use the same sequence of signals to shutdown samba3 as with the shell scripts
When we kill the timelimit process with SIGKILL, it can't kill its
children...
metze
| -rw-r--r-- | selftest/target/Samba3.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index e1bea16523..2b96226355 100644 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -41,6 +41,9 @@ sub teardown_env($$) $self->stop_sig_term($smbdpid); $self->stop_sig_term($nmbdpid); $self->stop_sig_term($winbinddpid); + + sleep(2); + $self->stop_sig_kill($smbdpid); $self->stop_sig_kill($nmbdpid); $self->stop_sig_kill($winbinddpid); @@ -187,7 +190,7 @@ sub stop_sig_term($$) { sub stop_sig_kill($$) { my ($self, $pid) = @_; - kill("KILL", $pid) or warn("Unable to kill $pid: $!"); + kill("ALRM", $pid) or warn("Unable to kill $pid: $!"); } sub write_pid($$$) |