diff options
| -rw-r--r-- | tests/ftp.pm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/ftp.pm b/tests/ftp.pm index 175257f04..57c45cfc9 100644 --- a/tests/ftp.pm +++ b/tests/ftp.pm @@ -262,9 +262,9 @@ sub stopprocess { if(not defined $pids) { return 1; } - signalpids("TERM", $pids); + signalpids("KILL", $pids); if(waitdeadpid($pids, $ONE_HALF_STOP_TIMEOUT) == 0) { - signalpids("INT", $pids); + signalpids("KILL", $pids); if(waitdeadpid($pids, $ONE_THIRD_STOP_TIMEOUT) == 0) { signalpids("KILL", $pids); if(waitdeadpid($pids, $ONE_SIXTH_STOP_TIMEOUT) == 0) { @@ -308,6 +308,12 @@ sub stopprocesspidfile { sub ftpkillslave { my ($id, $ext)=@_; + if(not defined $id) { + $id = ""; + } + if(not defined $ext) { + $ext = ""; + } my $ret = 1; # assume success stopping them my $pids = ""; my $pidfiles = ""; |