Commit 96edebf4 authored by Yang Tse's avatar Yang Tse
Browse files

improve synchronization between test harness runtests.pl script 

and test harness servers to minimize risk of false test failures.

http://curl.haxx.se/mail/lib-2008-04/0392.html
parent 3783b455

tests/ftp.pm

+22 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -84,4 +84,25 @@ sub ftpkillslaves { 
    }

}





sub set_advisor_read_lock {

    my ($filename) = @_;



    if(open(FILEH, ">$filename")) {

        close(FILEH);

        return;

    }

    printf "Error creating lock file $filename error: $!";

}





sub clear_advisor_read_lock {

    my ($filename) = @_;



    if(-f $filename) {

        unlink($filename);

    }

}





1;

tests/ftpserver.pl

+14 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -85,6 +85,8 @@ my $port = 8921; # just a default 
my $listenaddr = "127.0.0.1"; # just a default

my $pidfile = ".ftpd.pid"; # a default, use --pidfile



my $SERVERLOGS_LOCK="log/serverlogs.lock"; # server logs advisor read lock



do {

    if($ARGV[0] eq "-v") {

        $verbose=1;
@@ -121,6 +123,7 @@ sub catch_zap { 
    my $signame = shift;

    print STDERR "ftpserver.pl received SIG$signame, exiting\n";

    ftpkillslaves(1);

    clear_advisor_read_lock($SERVERLOGS_LOCK);

    die "Somebody sent me a SIG$signame";

}

$SIG{INT} = \&catch_zap;
@@ -146,6 +149,7 @@ sub sysread_or_die { 
        logmsg "Error: ftp$ftpdnum$ext sysread error: $!\n";

        kill(9, $sfpid);

        waitpid($sfpid, 0);

        clear_advisor_read_lock($SERVERLOGS_LOCK);

        die "Died in sysread_or_die() at $fcaller " .

            "line $lcaller. ftp$ftpdnum$ext sysread error: $!\n";

    }
@@ -155,6 +159,7 @@ sub sysread_or_die { 
        logmsg "Error: ftp$ftpdnum$ext read zero\n";

        kill(9, $sfpid);

        waitpid($sfpid, 0);

        clear_advisor_read_lock($SERVERLOGS_LOCK);

        die "Died in sysread_or_die() at $fcaller " .

            "line $lcaller. ftp$ftpdnum$ext read zero\n";

    }
@@ -176,6 +181,7 @@ sub startsf { 
        logmsg "Failed sockfilt command: $cmd\n";

        kill(9, $sfpid);

        waitpid($sfpid, 0);

        clear_advisor_read_lock($SERVERLOGS_LOCK);

        die "Failed to start sockfilt!";

    }

}
@@ -784,6 +790,8 @@ while(1) { 
    }

    logmsg "====> Client connect\n";



    set_advisor_read_lock($SERVERLOGS_LOCK);



    # flush data:

    $| = 1;
@@ -888,8 +896,13 @@ while(1) { 
            

    } # while(1)

    logmsg "====> Client disconnected\n";



    clear_advisor_read_lock($SERVERLOGS_LOCK);

}



print SFWRITE "QUIT\n";

waitpid $sfpid, 0;



clear_advisor_read_lock($SERVERLOGS_LOCK);



exit;

tests/runtests.pl

+29 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ my $SERVERIN="$LOGDIR/server.input"; # what curl sent the server 
my $SERVER2IN="$LOGDIR/server2.input"; # what curl sent the second server

my $CURLLOG="$LOGDIR/curl.log"; # all command lines run

my $FTPDCMD="$LOGDIR/ftpserver.cmd"; # copy ftp server instructions here

my $SERVERLOGS_LOCK="$LOGDIR/serverlogs.lock"; # server logs advisor read lock



# Normally, all test cases should be run, but at times it is handy to

# simply run a particular one:
@@ -202,6 +203,10 @@ my $sshdvernum; # for socks server, ssh daemon version number 
my $sshdverstr;  # for socks server, ssh daemon version string

my $sshderror;   # for socks server, ssh daemon version error



my $EXP_big_delay = 300;

my $EXP_max_delay = 0;

my $EXP_max_testn = 0;



#######################################################################

# variables the command line options may set

#
@@ -2096,6 +2101,27 @@ sub singletest { 
        }

    }



    # If a server logs advisor read lock file exists, it is an indication

    # that the server has not yet finished writing out all its log files,

    # including server request log files used for protocol verification.

    # So, if the lock file exists the script waits here a certain amount

    # of time until the server removes it, or the given time expires.

    # Test harness ssh server does not have this synchronization mechanism,

    # this implies that some ssh server based tests might need a small delay

    # in the postcheck section to avoid false test failures.



    my $lockretry = ($testnum == 190) ? 10 : $EXP_big_delay ;

    while((-f $SERVERLOGS_LOCK) && $lockretry--) {

        sleep(1);

    }



    if($testnum != 190) {

        if($EXP_big_delay - $lockretry > $EXP_max_delay) {

            $EXP_max_delay = $EXP_big_delay - $lockretry;

            $EXP_max_testn = $testnum;

        }

    }



    # run the postcheck command

    my @postcheck= getpart("client", "postcheck");

    $cmd = $postcheck[0];
@@ -3120,6 +3146,9 @@ if($skipped) { 
        logmsg ")\n";

    }

}



logmsg "EXPERIMENTAL: lock max delay ($EXP_max_delay seconds) for test # $EXP_max_testn \n";



if($total && ($ok != $total)) {

    exit 1;

}

tests/server/sws.c

+6 −0
Original line number Diff line number Diff line
@@ -988,6 +988,8 @@ int main(int argc, char *argv[]) 
      break;

    }



    set_advisor_read_lock(SERVERLOGS_LOCK);



#ifdef CURL_SWS_FORK_ENABLED

    if(use_fork) {

      /* The fork enabled version just forks off the child and don't care
@@ -1063,6 +1065,8 @@ int main(int argc, char *argv[]) 
    logmsg("====> Client disconnect");

    sclose(msgsock);



    clear_advisor_read_lock(SERVERLOGS_LOCK);



    if (req.testno == DOCNUMBER_QUIT)

      break;

#ifdef CURL_SWS_FORK_ENABLED
@@ -1072,6 +1076,8 @@ int main(int argc, char *argv[]) 


  sclose(sock);



  clear_advisor_read_lock(SERVERLOGS_LOCK);



  return 0;

}

tests/server/tftpd.c

+19 −5
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ int main(int argc, char **argv) 
  int flag;

  int rc;

  struct testcase test;

  int result = 0;



  while(argc>arg) {

    if(!strcmp("--version", argv[arg])) {
@@ -518,20 +519,25 @@ int main(int argc, char **argv) 
                 (struct sockaddr *)&from, &fromlen);

    if (n < 0) {

      logmsg("recvfrom:\n");

      return 3;

      result = 3;

      break;

    }



    set_advisor_read_lock(SERVERLOGS_LOCK);



    from.sin_family = AF_INET;



    peer = socket(AF_INET, SOCK_DGRAM, 0);

    if (peer < 0) {

      logmsg("socket:\n");

      return 2;

      result = 2;

      break;

    }



    if (connect(peer, (struct sockaddr *)&from, sizeof(from)) < 0) {

      logmsg("connect: fail\n");

      return 1;

      result = 1;

      break;

    }

    maxtimeout = 5*TIMEOUT;
@@ -545,8 +551,14 @@ int main(int argc, char **argv) 
        free(test.buffer);

    }

    sclose(peer);



    clear_advisor_read_lock(SERVERLOGS_LOCK);



  } while(1);

  return 0;



  clear_advisor_read_lock(SERVERLOGS_LOCK);



  return result;

}



struct formats {
@@ -734,8 +746,10 @@ static void timer(int signum) 
  logmsg("alarm!");



  timeout += rexmtval;

  if (timeout >= maxtimeout)

  if(timeout >= maxtimeout) {

    clear_advisor_read_lock(SERVERLOGS_LOCK);

    exit(1);

  }

#ifdef HAVE_SIGSETJMP

  siglongjmp(timeoutbuf, 1);

#endif