Commit adea16a2 authored by Yang Tse's avatar Yang Tse
Browse files

Revert to KILL test servers until all test servers 

have proper TERM and INT signal handlers implemented.
parent 7f2d5cab

tests/ftp.pm

+8 −2
Original line number Diff line number Diff line
@@ -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 = "";