# A regression test "framework" for Privoxy. For documentation see:
# perldoc privoxy-regression-test.pl
#
-# $Id: privoxy-regression-test.pl,v 1.65 2011/04/19 13:10:11 fabiankeil Exp $
+# $Id: privoxy-regression-test.pl,v 1.72 2011/06/29 18:34:23 fabiankeil Exp $
#
# Wish list:
#
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;
my $expected_status_code = $test->{'expected-status-code'};
if (defined $test->{method}) {
- $curl_parameters .= '--request ' . $test->{method} . ' ';
+ $curl_parameters .= quote('--request') . quote($test->{method}) . ' ';
}
if ($test->{type} == TRUSTED_CGI_REQUEST) {
- $curl_parameters .= '--referer ' . PRIVOXY_CGI_URL . ' ';
+ $curl_parameters .= quote('--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'};
}
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) {