X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=tools%2Fprivoxy-regression-test.pl;h=a8ee05174a1329e595926f84b7f9628d1c7fd29b;hp=5803ce50392a47341d4359a63d9a8824eac95169;hb=c5245d06d667d761dc6b19f6a3b810dbdf9e5c9b;hpb=307ea1408d6788f44f6892d91b293870054f6732 diff --git a/tools/privoxy-regression-test.pl b/tools/privoxy-regression-test.pl index 5803ce50..a8ee0517 100755 --- a/tools/privoxy-regression-test.pl +++ b/tools/privoxy-regression-test.pl @@ -7,7 +7,7 @@ # A regression test "framework" for Privoxy. For documentation see: # perldoc privoxy-regression-test.pl # -# $Id: privoxy-regression-test.pl,v 1.53 2009/09/18 18:25:46 fabiankeil Exp $ +# $Id: privoxy-regression-test.pl,v 1.73 2011/06/29 18:34:38 fabiankeil Exp $ # # Wish list: # @@ -19,7 +19,7 @@ # - Document magic Expect Header values # - Internal fuzz support? # -# Copyright (c) 2007-2009 Fabian Keil +# Copyright (c) 2007-2011 Fabian Keil # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -40,7 +40,7 @@ use strict; use Getopt::Long; use constant { - PRT_VERSION => 'Privoxy-Regression-Test 0.3', + PRT_VERSION => 'Privoxy-Regression-Test 0.4', CURL => 'curl', @@ -52,6 +52,7 @@ use constant { # 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/', @@ -83,20 +84,16 @@ use constant { STICKY_ACTIONS_TEST => 5, TRUSTED_CGI_REQUEST => 6, BLOCK_TEST => 7, - REDIRECT_TEST => 8, + REDIRECT_TEST =>108, }; sub init_our_variables () { 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 () { @@ -221,7 +218,7 @@ sub tokenize ($) { s@\s*$@@; # Reverse HTML-encoding - # XXX: Seriously imcomplete. + # XXX: Seriously incomplete. s@"@"@g; s@&@&@g; @@ -247,50 +244,59 @@ sub enlist_new_test ($$$$$$) { my ($regression_tests, $token, $value, $si, $ri, $number) = @_; my $type; + my $executor; if ($token eq 'set header') { l(LL_FILE_LOADING, "Header to set: " . $value); $type = CLIENT_HEADER_TEST; + $executor = \&execute_client_header_regression_test; } elsif ($token eq 'request header') { l(LL_FILE_LOADING, "Header to request: " . $value); $type = SERVER_HEADER_TEST; + $executor = \&execute_server_header_regression_test; $$regression_tests[$si][$ri]{'expected-status-code'} = 200; } elsif ($token eq 'trusted cgi request') { l(LL_FILE_LOADING, "CGI URL to test in a dumb way: " . $value); $type = TRUSTED_CGI_REQUEST; + $executor = \&execute_dumb_fetch_test; $$regression_tests[$si][$ri]{'expected-status-code'} = 200; } elsif ($token eq 'fetch test') { l(LL_FILE_LOADING, "URL to test in a dumb way: " . $value); $type = DUMB_FETCH_TEST; + $executor = \&execute_dumb_fetch_test; $$regression_tests[$si][$ri]{'expected-status-code'} = 200; } elsif ($token eq 'method test') { l(LL_FILE_LOADING, "Method to test: " . $value); $type = METHOD_TEST; + $executor = \&execute_method_test; $$regression_tests[$si][$ri]{'expected-status-code'} = 200; } elsif ($token eq 'blocked url') { l(LL_FILE_LOADING, "URL to block-test: " . $value); + $executor = \&execute_block_test; $type = BLOCK_TEST; } elsif ($token eq 'url') { l(LL_FILE_LOADING, "Sticky URL to test: " . $value); $type = STICKY_ACTIONS_TEST; + $executor = \&execute_sticky_actions_test; } elsif ($token eq 'redirected url') { l(LL_FILE_LOADING, "Redirected URL to test: " . $value); $type = REDIRECT_TEST; + $executor = \&execute_redirect_test; } else { @@ -299,6 +305,7 @@ sub enlist_new_test ($$$$$$) { $$regression_tests[$si][$ri]{'type'} = $type; $$regression_tests[$si][$ri]{'level'} = $type; + $$regression_tests[$si][$ri]{'executor'} = $executor; check_for_forbidden_characters($value); @@ -332,7 +339,7 @@ sub load_action_files ($) { 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; @@ -361,6 +368,7 @@ sub load_action_files ($) { $ri++; $count++; enlist_new_test(\@regression_tests, $token, $value, $si, $ri, $count); + $no_checks = 1; # Already validated by enlist_new_test(). } if ($token =~ /level\s+(\d+)/i) { @@ -453,10 +461,14 @@ sub load_action_files ($) { # We don't use it, so we don't need $no_checks = 1; + l(LL_STATUS, "Enabling no_checks for $token") unless $no_checks; + } + + # XXX: Necessary? + unless ($no_checks) { + check_for_forbidden_characters($value); + check_for_forbidden_characters($token); } - # XXX: Neccessary? - check_for_forbidden_characters($value) unless $no_checks; - check_for_forbidden_characters($token); } } @@ -493,7 +505,7 @@ sub execute_regression_tests () { my $failures; my $skipped = 0; - for my $s (0 .. @regression_tests - 1) { + for (my $s = 0; $s < @regression_tests; $s++) { my $r = 0; @@ -501,6 +513,8 @@ sub execute_regression_tests () { die "Section id mismatch" if ($s != $regression_tests[$s][$r]{'section-id'}); die "Regression test id mismatch" if ($r != $regression_tests[$s][$r]{'regression-test-id'}); + die "Internal error. Test executor missing." + unless defined $regression_tests[$s][$r]{executor}; my $number = $regression_tests[$s][$r]{'number'}; my $skip_reason = get_skip_reason($regression_tests[$s][$r]); @@ -513,12 +527,13 @@ sub execute_regression_tests () { } else { - my $result = execute_regression_test($regression_tests[$s][$r]); + my $result = $regression_tests[$s][$r]{executor}($regression_tests[$s][$r]); log_result($regression_tests[$s][$r], $result, $tests); $successes += $result; $tests++; + sleep(get_cli_option('sleep-time')) if (cli_option_is_set('sleep-time')); } $r++; } @@ -576,11 +591,11 @@ sub level_is_unacceptable ($) { } 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 { @@ -651,49 +666,6 @@ sub register_dependency ($$) { } } -# XXX: somewhat misleading name -sub execute_regression_test ($) { - - my $test = shift; - my $result = 0; - - if ($test->{'type'} == CLIENT_HEADER_TEST) { - - $result = execute_client_header_regression_test($test); - - } elsif ($test->{'type'} == SERVER_HEADER_TEST) { - - $result = execute_server_header_regression_test($test); - - } elsif ($test->{'type'} == DUMB_FETCH_TEST - or $test->{'type'} == TRUSTED_CGI_REQUEST) { - - $result = execute_dumb_fetch_test($test); - - } elsif ($test->{'type'} == METHOD_TEST) { - - $result = execute_method_test($test); - - } elsif ($test->{'type'} == BLOCK_TEST) { - - $result = execute_block_test($test); - - } elsif ($test->{'type'} == STICKY_ACTIONS_TEST) { - - $result = execute_sticky_actions_test($test); - - } elsif ($test->{'type'} == REDIRECT_TEST) { - - $result = execute_redirect_test($test); - - } else { - - die "Unsupported test type detected: " . $test->{'type'}; - } - - return $result; -} - sub execute_method_test ($) { my $test = shift; @@ -727,7 +699,7 @@ sub execute_redirect_test ($) { my $redirect_destination; my $expected_redirect_destination = $test->{'redirect destination'}; - # XXX: Check if a redirect actualy applies before doing the request. + # XXX: Check if a redirect actually applies before doing the request. # otherwise the test may hit a real server in failure cases. $curl_parameters .= '--head '; @@ -771,13 +743,13 @@ sub execute_dumb_fetch_test ($) { 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); @@ -849,7 +821,10 @@ sub get_final_results ($) { next unless ($final_results_reached); last if (m@@); - if (m@
([-+])([^>]*)(?: (\{.*\}))?@) { + # Privoxy versions before 3.0.16 add a space + # between action name and parameters, therefore + # the " ?". + if (m@
([-+])([^>]*)(?: ?(\{.*\}))?@) { my $action = $1.$2; my $parameter = $3; @@ -940,12 +915,9 @@ sub check_header_result ($$) { 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 . "'"); @@ -953,26 +925,20 @@ sub check_header_result ($$) { } 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"); @@ -980,12 +946,9 @@ sub check_header_result ($$) { } 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 . "'"); @@ -1025,7 +988,7 @@ sub get_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'}; } @@ -1344,7 +1307,7 @@ sub log_message ($) { 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) { @@ -1451,7 +1414,25 @@ sub quote ($) { } sub print_version () { - printf PRT_VERSION . "\n" . 'Copyright (C) 2007-2009 Fabian Keil ' . "\n"; + printf PRT_VERSION . "\n" . 'Copyright (C) 2007-2011 Fabian Keil ' . "\n"; +} + +sub list_test_types () { + my %test_types = ( + 'Client header test' => CLIENT_HEADER_TEST, + 'Server header test' => 2, + 'Dumb fetch test' => 3, + 'Method test' => 4, + 'Sticky action test' => 5, + 'Trusted CGI test' => 6, + 'Block test' => 7, + 'Redirect test' => 108, + ); + + print "\nThe supported test types and their default levels are:\n"; + foreach my $test_type (sort { $test_types{$a} <=> $test_types{$b} } keys %test_types) { + printf " %-20s -> %3.d\n", $test_type, $test_types{$test_type}; + } } sub help () { @@ -1477,12 +1458,21 @@ Options and their default values if they have any: [--privoxy-address] [--retries $cli_options{'retries'}] [--show-skipped-tests] + [--sleep-time $cli_options{'sleep-time'}] [--test-number] [--verbose] [--version] -see "perldoc $0" for more information EOF ; + + list_test_types(); + + print << " EOF" + +Try "perldoc $0" for more information + EOF + ; + exit(0); } @@ -1497,6 +1487,7 @@ sub init_cli_options () { $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; } @@ -1513,7 +1504,7 @@ sub parse_cli_options () { 'fuzzer-address=s' => \$cli_options{'fuzzer-address'}, 'fuzzer-feeding' => \$cli_options{'fuzzer-feeding'}, 'header-fuzzing' => \$cli_options{'header-fuzzing'}, - 'help' => sub {help}, + 'help' => \&help, 'level=s' => \$cli_options{'level'}, 'loops=s' => \$cli_options{'loops'}, 'max-level=s' => \$cli_options{'max-level'}, @@ -1522,10 +1513,11 @@ sub parse_cli_options () { 'privoxy-address=s' => \$cli_options{'privoxy-address'}, 'retries=s' => \$cli_options{'retries'}, 'show-skipped-tests' => \$cli_options{'show-skipped-tests'}, + 'sleep-time=s' => \$cli_options{'sleep-time'}, 'test-number=s' => \$cli_options{'test-number'}, 'verbose' => \$cli_options{'verbose'}, 'version' => sub {print_version && exit(0)} - ); + ) or exit(1); $log_level |= $cli_options{'debug'}; } @@ -1602,7 +1594,7 @@ B [B<--debug bitmask>] [B<--forks> forks] [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 @@ -1698,11 +1690,16 @@ control which ones to execute (see I below). Test levels are either set with the B directive, or implicitly through the test type. -Redirect tests default to level 8, block tests to level 7, +Redirect tests default to level 108, block tests to level 7, fetch tests to level 6, "Sticky Actions" tests default to level 5, tests for trusted CGI requests to level 3 and client-header-action tests to level 1. +The current redirect test level is above the default +max-level value as failed tests will result in outgoing +connections. Use the B<--max-level> option to run them +as well. + =head1 OPTIONS B<--debug bitmask> Add the bitmask provided as integer @@ -1759,7 +1756,10 @@ number. B<--show-skipped-tests> Log skipped tests even if verbose mode is off. -B<--verbose> Log succesful tests as well. By default only +B<--sleep-time seconds> Wait B 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. B<--version> Print version and exit.