diff options
| -rw-r--r-- | tests/ftp.pm | 6 | ||||
| -rwxr-xr-x | tests/runtests.pl | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/ftp.pm b/tests/ftp.pm index e1d7552d2..6218bb482 100644 --- a/tests/ftp.pm +++ b/tests/ftp.pm @@ -120,8 +120,8 @@ sub killpid { # Allow all signalled processes five seconds to gracefully die. if(defined(@signalled)) { - my $eighths = 40; - while($eighths--) { + my $twentieths = 5 * 20; + while($twentieths--) { for(my $i = scalar(@signalled) - 1; $i >= 0; $i--) { my $pid = $signalled[$i]; if(!kill(0, $pid)) { @@ -132,7 +132,7 @@ sub killpid { } } last if(not scalar(@signalled)); - select(undef, undef, undef, 0.125); + select(undef, undef, undef, 0.05); } } diff --git a/tests/runtests.pl b/tests/runtests.pl index 39a5531ab..44697fa73 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -2251,9 +2251,9 @@ sub singletest { # of time until the server removes it, or the given time expires. if($serverlogslocktimeout) { - my $lockretry = $serverlogslocktimeout * 8; + my $lockretry = $serverlogslocktimeout * 20; while((-f $SERVERLOGS_LOCK) && $lockretry--) { - select(undef, undef, undef, 0.125); + select(undef, undef, undef, 0.05); } if(($lockretry < 0) && ($serverlogslocktimeout >= $defserverlogslocktimeout)) { @@ -3421,7 +3421,7 @@ if($timestats) { logmsg "$txt\n"; } - $counter = 25; + $counter = 10; logmsg "\nTest definition reading and preparation time per test ". sprintf("(%s)...\n\n", (not $fullstats)?"top $counter":"full"); logmsg "-time- test\n"; @@ -3441,7 +3441,7 @@ if($timestats) { logmsg "$txt\n"; } - $counter = 25; + $counter = 15; logmsg "\nTest server logs lock removal time per test ". sprintf("(%s)...\n\n", (not $fullstats)?"top $counter":"full"); logmsg "-time- test\n"; @@ -3451,7 +3451,7 @@ if($timestats) { logmsg "$txt\n"; } - $counter = 25; + $counter = 10; logmsg "\nTest results verification time per test ". sprintf("(%s)...\n\n", (not $fullstats)?"top $counter":"full"); logmsg "-time- test\n"; @@ -3462,7 +3462,7 @@ if($timestats) { } $counter = 50; - logmsg "\nAggregated time per test ". + logmsg "\nTotal time per test ". sprintf("(%s)...\n\n", (not $fullstats)?"top $counter":"full"); logmsg "-time- test\n"; logmsg "------ ----\n"; |