# A regression test "framework" for Privoxy. For documentation see:
# perldoc privoxy-regression-test.pl
#
-# $Id: privoxy-regression-test.pl,v 1.64 2011/02/19 13:59:59 fabiankeil Exp $
+# $Id: privoxy-regression-test.pl,v 1.212 2011/07/17 13:49:52 fk Exp $
#
# Wish list:
#
# XXX: why limit at all?
CLI_MAX_LEVEL => 100,
CLI_FORKS => 0,
+ CLI_SLEEP_TIME => 0,
PRIVOXY_CGI_URL => 'http://p.p/',
FELLATIO_URL => 'http://127.0.0.1:8080/',
our $leading_log_time = LEADING_LOG_TIME;
our $leading_log_date = LEADING_LOG_DATE;
-
our $privoxy_cgi_url = PRIVOXY_CGI_URL;
-
our $verbose_test_description = VERBOSE_TEST_DESCRIPTION;
-
our $log_level = get_default_log_level();
-
}
sub get_default_log_level () {
for my $file_number (0 .. @actionfiles - 1) {
- my $curl_url = ' "' . $actionfiles[$file_number] . '"';
+ my $curl_url = quote($actionfiles[$file_number]);
my $actionfile = undef;
my $sticky_actions = undef;
my $failures;
my $skipped = 0;
- for my $s (0 .. @regression_tests - 1) {
+ for (my $s = 0; $s < @regression_tests; $s++) {
my $r = 0;
$successes += $result;
$tests++;
+ sleep(get_cli_option('sleep-time')) if (cli_option_is_set('sleep-time'));
}
$r++;
}
} elsif ($level < $min_level) {
- $reason = "Level to low (" . $level . " < " . $min_level . ")";
+ $reason = "Level too low (" . $level . " < " . $min_level . ")";
} elsif ($level > $max_level) {
- $reason = "Level to high (" . $level . " > " . $max_level . ")";
+ $reason = "Level too high (" . $level . " > " . $max_level . ")";
} else {
my $expected_status_code = $test->{'expected-status-code'};
if (defined $test->{method}) {
- $curl_parameters .= '--request ' . $test->{method} . ' ';
+ $curl_parameters .= '--request ' . quote($test->{method}) . ' ';
}
if ($test->{type} == TRUSTED_CGI_REQUEST) {
- $curl_parameters .= '--referer ' . PRIVOXY_CGI_URL . ' ';
+ $curl_parameters .= '--referer ' . quote(PRIVOXY_CGI_URL) . ' ';
}
- $curl_parameters .= $test->{'data'};
+ $curl_parameters .= quote($test->{'data'});
$buffer_ref = get_page_with_curl($curl_parameters);
$status_code = get_status_code($buffer_ref);
if ($expect_header eq 'NO CHANGE') {
- if (defined($header) and $header eq $test->{'data'}) {
-
- $success = 1;
-
- } else {
+ $success = (defined($header) and $header eq $test->{'data'});
+ unless ($success) {
$header = "REMOVAL" unless defined $header;
l(LL_VERBOSE_FAILURE,
"Ooops. Got: '" . $header . "' while expecting: '" . $expect_header . "'");
} elsif ($expect_header eq 'REMOVAL') {
- if (defined($header) and $header eq $test->{'data'}) {
+ # XXX: Use more reliable check here and make sure
+ # the header has a different name.
+ $success = not (defined($header) and $header eq $test->{'data'});
+ unless ($success) {
l(LL_VERBOSE_FAILURE,
"Ooops. Expected removal but: '" . $header . "' is still there.");
-
- } else {
-
- # XXX: Use more reliable check here and make sure
- # the header has a different name.
- $success = 1;
}
} elsif ($expect_header eq 'SOME CHANGE') {
- if (defined($header) and not $header eq $test->{'data'}) {
-
- $success = 1;
-
- } else {
+ $success = (defined($header) and $header ne $test->{'data'});
+ unless ($success) {
$header = "REMOVAL" unless defined $header;
l(LL_VERBOSE_FAILURE,
"Ooops. Got: '" . $header . "' while expecting: SOME CHANGE");
} else {
- if (defined($header) and $header eq $expect_header) {
-
- $success = 1;
-
- } else {
+ $success = (defined($header) and $header eq $expect_header);
+ unless ($success) {
$header = "No matching header" unless defined $header; # XXX: No header detected to be precise
l(LL_VERBOSE_FAILURE,
"Ooops. Got: '" . $header . "' while expecting: '" . $expect_header . "'");
if ($expect_header eq 'REMOVAL'
or $expect_header eq 'NO CHANGE'
- or $expect_header eq 'SOME CHANGE') {
+ or $expect_header eq 'SOME CHANGE') {
$expect_header = $test->{'data'};
}
my $retries_left = get_cli_option('retries') + 1;
my $failure_reason;
- $curl_line .= ' --proxy ' . $proxy if (defined $proxy);
-
+ if (defined $proxy) {
+ $curl_line .= ' --proxy ' . quote($proxy);
+ }
# We want to see the HTTP status code
$curl_line .= " --include ";
# Let Privoxy emit two log messages less.
if ($leading_log_date) {
$year += 1900;
$mon += 1;
- $time_stamp = sprintf("%i/%.2i/%.2i", $year, $mon, $mday);
+ $time_stamp = sprintf("%i-%.2i-%.2i", $year, $mon, $mday);
}
if ($leading_log_time) {
[--privoxy-address]
[--retries $cli_options{'retries'}]
[--show-skipped-tests]
+ [--sleep-time $cli_options{'sleep-time'}]
[--test-number]
[--verbose]
[--version]
$cli_options{'max-level'} = CLI_MAX_LEVEL;
$cli_options{'max-time'} = CLI_MAX_TIME;
$cli_options{'min-level'} = CLI_MIN_LEVEL;
+ $cli_options{'sleep-time'}= CLI_SLEEP_TIME;
$cli_options{'retries'} = CLI_RETRIES;
}
init_cli_options();
GetOptions (
- 'debug=s' => \$cli_options{'debug'},
- 'forks=s' => \$cli_options{'forks'},
+ 'debug=i' => \$cli_options{'debug'},
+ 'forks=i' => \$cli_options{'forks'},
'fuzzer-address=s' => \$cli_options{'fuzzer-address'},
'fuzzer-feeding' => \$cli_options{'fuzzer-feeding'},
'header-fuzzing' => \$cli_options{'header-fuzzing'},
'help' => \&help,
- 'level=s' => \$cli_options{'level'},
- 'loops=s' => \$cli_options{'loops'},
- 'max-level=s' => \$cli_options{'max-level'},
- 'max-time=s' => \$cli_options{'max-time'},
- 'min-level=s' => \$cli_options{'min-level'},
+ 'level=i' => \$cli_options{'level'},
+ 'loops=i' => \$cli_options{'loops'},
+ 'max-level=i' => \$cli_options{'max-level'},
+ 'max-time=i' => \$cli_options{'max-time'},
+ 'min-level=i' => \$cli_options{'min-level'},
'privoxy-address=s' => \$cli_options{'privoxy-address'},
- 'retries=s' => \$cli_options{'retries'},
+ 'retries=i' => \$cli_options{'retries'},
'show-skipped-tests' => \$cli_options{'show-skipped-tests'},
- 'test-number=s' => \$cli_options{'test-number'},
+ 'sleep-time=i' => \$cli_options{'sleep-time'},
+ 'test-number=i' => \$cli_options{'test-number'},
'verbose' => \$cli_options{'verbose'},
'version' => sub {print_version && exit(0)}
) or exit(1);
[B<--loops count>] [B<--max-level max-level>] [B<--max-time max-time>]
[B<--min-level min-level>] B<--privoxy-address proxy-address>
[B<--retries retries>] [B<--test-number test-number>]
-[B<--show-skipped-tests>] [B<--verbose>]
+[B<--show-skipped-tests>] [B<--sleep-time> seconds] [B<--verbose>]
[B<--version>]
=head1 DESCRIPTION
B<--show-skipped-tests> Log skipped tests even if verbose mode is off.
+B<--sleep-time seconds> Wait B<seconds> between tests. Useful when
+debugging issues with systems that don't log with millisecond precision.
+
B<--verbose> Log successful tests as well. By default only
the failures are logged.