github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

test: nginx: Speeds up regression test in nginx.

Browse Source 
Instead of use `sleep` it nows parser the nginx logs to figure out
whenever it start or stop. Audit log timeout was reduced to 8 seconds.
This commit is contained in:
Felipe Zimmerle 2014-01-16 10:30:23 -08:00
parent fe14d9df4d
commit d26e639512
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/run-regression-tests-nginx.pl
View File

@ -459,14 +459,19 @@ sub match_log {
return; return;
} }
$timeout = 0 unless (defined $timeout); $timeout = 1 unless (defined $timeout);
if ($timeout == 1)
{
$timeout = 0.5;
}
# Audit logs are taking too long to be written on the disk. One of the # Audit logs are taking too long to be written on the disk. One of the
# consequence of that is to have tests that demands to read from audit # consequence of that is to have tests that demands to read from audit
# log failing. Increase the timeout here, make it wait a little bit # log failing. Increase the timeout here, make it wait a little bit
# more for the logs before gave up. # more for the logs before gave up.
if ($name eq "audit") { if ($name eq "audit") {
$timeout = 20; $timeout = 8;
} }
my $i = 0; my $i = 0;
@ -490,6 +495,7 @@ READ: {
#dbg("Match \"$re\" in $name \"$$rbuf\" ($n)"); #dbg("Match \"$re\" in $name \"$$rbuf\" ($n)");
if ($$rbuf =~ m/$re/m) { if ($$rbuf =~ m/$re/m) {
$rc = $&; $rc = $&;
# print "bonga\n";
last; last;
} }
# TODO: Use select()/poll() # TODO: Use select()/poll()
@ -503,6 +509,7 @@ READ: {
print STDERR "." print STDERR "."
} }
} }
system("sync");
} while (gettimeofday - $t0 < $timeout); } while (gettimeofday - $t0 < $timeout);
} }
print STDERR "\n" if ($graphed); print STDERR "\n" if ($graphed);
@ -619,14 +626,16 @@ sub nginx_stop {
$rc = -1; $rc = -1;
} }
sleep 0.5; unless (defined match_log("error", qr/signal [0-9]+ \(SIGCHLD\) received/, 60, "exited with code 0")) {
if (-e $PID_FILE) { vrb(join(" ", map { quote_shell($_) } @p));
vrb("Nginx pid file still exists, sleeping for more 20 seconds."); msg("nginx server failed to shutdown.");
sleep 20; sleep 0.5;
return -1;
}
if (-e $PID_FILE) { if (-e $PID_FILE) {
msg("Nginx stop failed: $PID_FILE still exists"); msg("nginx server failed to shutdown.");
} return -1;
} }
return $rc; return $rc;
@ -767,14 +776,13 @@ sub nginx_start {
$rc = -1; $rc = -1;
} }
# Look for startup msg # Look for startup msworker cycleg
# unless (defined match_log("error", qr/start worker process/, 60, "Waiting on nginx to start: ")) { unless (defined match_log("error", qr/setproctitle: "nginx: worker process"/, 60, "worker cycle")) {
# vrb(join(" ", map { quote_shell($_) } @p)); vrb(join(" ", map { quote_shell($_) } @p));
# vrb(match_log("error", qr/(^.*ModSecurity: .*)/sm, 10)); msg("Nginx server failed to start.");
# msg("Nginx server failed to start."); nginx_stop();
# nginx_stop(); return -1;
# return -1; }
# }
return $rc; return $rc;
} }