selftest/Samba3: use the same sequence of signals to shutdown samba3 as with the...

When we kill the timelimit process with SIGKILL, it can't kill its
children...

metze

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index e1bea16523b9031072176cd46820c011cb1ca838..2b96226355acc9e7dca9400758f0f06e182db212 100644 (file)
--- 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);
        $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);
        $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) = @_;
 
 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($$$)
 }
 
 sub write_pid($$$)