You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-commits@perl.apache.org by go...@apache.org on 2007/12/31 09:00:11 UTC
svn commit: r607695 - in /perl/Apache-Test/trunk:
Apache-TestItSelf/lib/MyTest/ lib/Apache/
Author: gozer
Date: Mon Dec 31 00:00:09 2007
New Revision: 607695
URL: http://svn.apache.org/viewvc?rev=607695&view=rev
Log:
*Whitespace*
Cleanup trailing whitespace, whitespace-only lines and litteral
tab characters.
Reviewed-By: gozer
Submitted-by: Torsten Foertsch <to...@gmx.net>
Message-Id: <20...@gmx.net>
Modified:
perl/Apache-Test/trunk/Apache-TestItSelf/lib/MyTest/Util.pm
perl/Apache-Test/trunk/lib/Apache/Test.pm
perl/Apache-Test/trunk/lib/Apache/TestClient.pm
perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm
perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm
perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm
perl/Apache-Test/trunk/lib/Apache/TestHarness.pm
perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm
perl/Apache-Test/trunk/lib/Apache/TestMB.pm
perl/Apache-Test/trunk/lib/Apache/TestRequest.pm
perl/Apache-Test/trunk/lib/Apache/TestRun.pm
perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm
perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm
perl/Apache-Test/trunk/lib/Apache/TestServer.pm
perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm
perl/Apache-Test/trunk/lib/Apache/TestTrace.pm
perl/Apache-Test/trunk/lib/Apache/TestUtil.pm
Modified: perl/Apache-Test/trunk/Apache-TestItSelf/lib/MyTest/Util.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Apache-TestItSelf/lib/MyTest/Util.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Apache-TestItSelf/lib/MyTest/Util.pm (original)
+++ perl/Apache-Test/trunk/Apache-TestItSelf/lib/MyTest/Util.pm Mon Dec 31 00:00:09 2007
@@ -136,9 +136,9 @@
timeout => 200,
makepl_arg => 'MOD_PERL=2 -libmodperl mod_perl-5.8.5-ithread.so',
);
-
+
my $path = "/home/$ENV{USER}/httpd";
-
+
@Apache::TestItSelf::Configs = (
{
apxs_exec => "$path/prefork/bin/apxs",
Modified: perl/Apache-Test/trunk/lib/Apache/Test.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/Test.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/Test.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/Test.pm Mon Dec 31 00:00:09 2007
@@ -28,7 +28,7 @@
# check first (and we choose mp2) $mod_perl::VERSION == 2.0
# just because someone loaded Apache::Test. This Is Bad. so,
# let's try to correct for that here by removing mod_perl from
- # %INC after the above use() statements settle in. nobody
+ # %INC after the above use() statements settle in. nobody
# should be relying on us loading up mod_perl.pm anyway...
delete $INC{'mod_perl.pm'};
@@ -73,9 +73,9 @@
if (($_[0] and $_[0] =~ m/^-withtestmore/) || @testmore) {
# special hoops for Test::More support
- $real_plan = eval {
+ $real_plan = eval {
- require Test::More;
+ require Test::More;
no warnings qw(numeric);
Test::Builder->VERSION('0.18_01');
@@ -152,7 +152,7 @@
$builder->output(\*STDOUT);
$builder->todo_output(\*STDOUT);
- # this is STDOUT because Test::More seems to put
+ # this is STDOUT because Test::More seems to put
# most of the stuff we want on STDERR, so it ends
# up in the error_log instead of where the user can
# see it. consider leaving it alone based on
@@ -636,7 +636,7 @@
use need():
plan tests => 5,
- need 'LWP',
+ need 'LWP',
{ "not Win32" => sub { $^O eq 'MSWin32'} };
see C<need()> for more info.
@@ -704,7 +704,7 @@
within test logic to adjust expectations based on older or newer
server versions.
-=over
+=over
=item need_http11
@@ -862,7 +862,7 @@
plan tests => 5,
need 'LWP',
- { "perl >= 5.8.0 and w/ithreads is required" =>
+ { "perl >= 5.8.0 and w/ithreads is required" =>
($Config{useperlio} && $] >= 5.008) },
{ "not Win32" => sub { $^O eq 'MSWin32' },
"foo is disabled" => \&is_foo_enabled,
@@ -970,11 +970,11 @@
=head1 Test::More Integration
-There are a few caveats if you want to use I<Apache::Test> with
+There are a few caveats if you want to use I<Apache::Test> with
I<Test::More> instead of the default I<Test> backend. The first is
that I<Test::More> requires you to use its own C<plan()> function
and not the one that ships with I<Apache::Test>. I<Test::More> also
-defines C<ok()> and C<skip()> functions that are different, and
+defines C<ok()> and C<skip()> functions that are different, and
simply C<use>ing both modules in your test script will lead to redefined
warnings for these subroutines.
@@ -990,7 +990,7 @@
ok ('yes', 'testing ok'); # Test::More::ok()
-Now, while this works fine for standard client-side tests
+Now, while this works fine for standard client-side tests
(such as C<t/basic.t>), the more advanced features of I<Apache::Test>
require using I<Test::More> as the sole driver behind the scenes.
@@ -1014,7 +1014,7 @@
instead of I<Test.pm> behind the scenes. Note that you are not
required to C<use Test::More> yourself with the C<-withtestmore>
option and that the C<use Test::More tests =E<gt> 1> syntax
-may have unexpected results.
+may have unexpected results.
Note that I<Test::More> version 0.49, available within the
I<Test::Simple> 0.49 distribution on CPAN, or greater is required
Modified: perl/Apache-Test/trunk/lib/Apache/TestClient.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestClient.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestClient.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestClient.pm Mon Dec 31 00:00:09 2007
@@ -136,7 +136,7 @@
close $s;
# an empty body is a valid response
- $res->{content} = ''
+ $res->{content} = ''
unless exists $res->{content} and defined $res->{content};
$res->{headers_as_string} =~ s/\015//g; #for as_string
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfig.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfig.pm Mon Dec 31 00:00:09 2007
@@ -761,7 +761,7 @@
sub select_first_port {
my $self = shift;
- my $port ||= $port_memoized || $ENV{APACHE_TEST_PORT}
+ my $port ||= $port_memoized || $ENV{APACHE_TEST_PORT}
|| $self->{vars}{port} || DEFAULT_PORT;
# memoize
@@ -1400,7 +1400,7 @@
finddepth(sub {
return unless /\.in$/;
(my $generated = $File::Find::name) =~ s/\.in$//;
- push @need_update, $generated
+ push @need_update, $generated
unless -e $generated && -M $generated < -M $File::Find::name;
}, $self->{vars}->{t_conf});
@@ -1645,7 +1645,7 @@
# if httpd.conf is older than executable
push @reasons,
"$exe is newer than $vars->{t_conf_file}"
- if -e $exe &&
+ if -e $exe &&
-e $vars->{t_conf_file} &&
-M $exe < -M $vars->{t_conf_file};
@@ -1899,7 +1899,7 @@
$cfg .= qx{$command};
$cfg .= ldd_as_string($httpd);
- }
+ }
else {
$cfg .= "\n\n*** The httpd binary was not found\n";
}
@@ -1934,7 +1934,7 @@
return $cfg;
}
-
+
# make a string suitable for feed to shell calls (wrap in quotes and
# escape quotes)
sub shell_ready {
@@ -2213,7 +2213,7 @@
sub custom_config_add_conf_opts {
my $args = shift;
- return unless $Apache::TestConfigData::vars and
+ return unless $Apache::TestConfigData::vars and
keys %$Apache::TestConfigData::vars;
debug "overlaying custom config data";
@@ -2330,7 +2330,7 @@
}
my $optional = 0;
my $wanted = 'httpd';
- $vars->{$wanted} =
+ $vars->{$wanted} =
_custom_config_prompt_path($wanted, \%choices, $optional);
}
@@ -2369,7 +2369,7 @@
}
my $optional = 1;
my $wanted = 'apxs';
- $vars->{$wanted} =
+ $vars->{$wanted} =
_custom_config_prompt_path($wanted, \%choices, $optional);
}
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm Mon Dec 31 00:00:09 2007
@@ -385,9 +385,9 @@
module MODULE_VAR_EXPORT name ## _module =
{
STANDARD_MODULE_STUFF,
- NULL, /* initializer */
+ NULL, /* initializer */
$cmodule_config_hooks,
- name ## _handlers, /* handlers */
+ name ## _handlers, /* handlers */
$cmodule_hooks_1
}
EOF
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm Mon Dec 31 00:00:09 2007
@@ -509,7 +509,7 @@
global $_num_failures;
global $_num_skips;
- $_test_num++;
+ $_test_num++;
if ($_num_skips)
{
@@ -715,7 +715,7 @@
{
$pass = ((require $module) == 'OK');
return ok($pass);
-}
+}
function skip($message, $num)
{
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm Mon Dec 31 00:00:09 2007
@@ -81,7 +81,7 @@
my $lib = "$Config{installbin}\\$Config{libperl}";
$lib =~ s/lib$/dll/;
$cfg = 'LoadFile ' . qq("$lib"\n) if -e $lib;
- }
+ }
# add the module we found to the cached modules list
# otherwise have_module('mod_perl') doesn't work unless
# we have a LoadModule in our base config
@@ -148,7 +148,7 @@
# propogate PerlPassEnv settings to the server
sub configure_env {
my $self = shift;
- $self->preamble(IfModule => 'mod_perl.c',
+ $self->preamble(IfModule => 'mod_perl.c',
[ qw(PerlPassEnv APACHE_TEST_TRACE_LEVEL
PerlPassEnv HARNESS_PERL_SWITCHES)
]);
Modified: perl/Apache-Test/trunk/lib/Apache/TestHarness.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestHarness.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestHarness.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestHarness.pm Mon Dec 31 00:00:09 2007
@@ -86,7 +86,7 @@
}
}
}
-
+
my $cmd = qq[$^X $source_lib $file];
my $h = Symbol::gensym();
@@ -140,15 +140,15 @@
my $ts = $args->{tests} || [];
if (@$ts) {
- for (@$ts) {
- if (-d $_) {
- push(@tests, sort <$base/$_/*.t>);
- }
- else {
- $_ .= ".t" unless /\.t$/;
- push(@tests, $_);
- }
- }
+ for (@$ts) {
+ if (-d $_) {
+ push(@tests, sort <$base/$_/*.t>);
+ }
+ else {
+ $_ .= ".t" unless /\.t$/;
+ push(@tests, $_);
+ }
+ }
}
else {
if ($args->{tdirs}) {
Modified: perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm Mon Dec 31 00:00:09 2007
@@ -59,16 +59,16 @@
my $ts = $args->{tests} || [];
if (@$ts) {
- for (@$ts) {
- if (-d $_) {
- push(@tests, sort <$base/$_/*.t>);
- push(@tests, sort <$base/$_/*.php>);
- }
- else {
- $_ .= ".t" unless /(\.t|\.php)$/;
- push(@tests, $_);
- }
- }
+ for (@$ts) {
+ if (-d $_) {
+ push(@tests, sort <$base/$_/*.t>);
+ push(@tests, sort <$base/$_/*.php>);
+ }
+ else {
+ $_ .= ".t" unless /(\.t|\.php)$/;
+ push(@tests, $_);
+ }
+ }
}
else {
if ($args->{tdirs}) {
Modified: perl/Apache-Test/trunk/lib/Apache/TestMB.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestMB.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestMB.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestMB.pm Mon Dec 31 00:00:09 2007
@@ -4,7 +4,7 @@
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
Modified: perl/Apache-Test/trunk/lib/Apache/TestRequest.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRequest.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRequest.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRequest.pm Mon Dec 31 00:00:09 2007
@@ -18,7 +18,7 @@
use strict;
use warnings FATAL => 'all';
-BEGIN {
+BEGIN {
$ENV{PERL_LWP_USE_HTTP_10} = 1; # default to http/1.0
$ENV{APACHE_TEST_HTTP_09_OK} ||= 0; # 0.9 responses are ok
}
@@ -688,7 +688,7 @@
return $res->content if $res->is_success;
- die join "\n",
+ die join "\n",
"request has failed (the response code was: " . $res->code . ")",
"see t/logs/error_log for more details\n";
}
Modified: perl/Apache-Test/trunk/lib/Apache/TestRun.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRun.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRun.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRun.pm Mon Dec 31 00:00:09 2007
@@ -49,7 +49,7 @@
my %original_t_perms = ();
my @std_run = qw(start-httpd run-tests stop-httpd);
-my @others = qw(verbose configure clean help ssl http11 bugreport
+my @others = qw(verbose configure clean help ssl http11 bugreport
save no-httpd one-process);
my @flag_opts = (@std_run, @others);
my @string_opts = qw(order trace);
@@ -212,7 +212,7 @@
# a workaround to support -verbose and -verbose=0|1
# $Getopt::Long::VERSION > 2.26 can use the "verbose:1" rule
# but we have to support older versions as well
- @ARGV = grep defined,
+ @ARGV = grep defined,
map {/-verbose=(\d)/ ? ($1 ? '-verbose' : undef) : $_ } @ARGV;
# permute : optional values can come before the options
@@ -868,7 +868,7 @@
$core_files{$file} = -M $file;
push @cores, $file;
}
- return @cores
+ return @cores
? join "\n", "server dumped core, for stacktrace, run:",
map { "gdb $vars->{httpd} -core $_" } @cores
: ();
@@ -980,7 +980,7 @@
my($uid, $gid) = (getpwnam($user))[2..3]
or die "Can't find out uid/gid of '$user'";
- warning "root mode: ".
+ warning "root mode: ".
"changing the files ownership to '$user' ($uid:$gid)";
finddepth(sub {
$original_t_perms{$File::Find::name} = [(stat $_)[4..5]];
@@ -1372,13 +1372,13 @@
directly. Here is an example of a custom C<t/TEST>
My::TestRun->new->run(@ARGV);
-
+
package My::TestRun;
use base 'Apache::TestRun';
sub bug_report {
my $self = shift;
-
+
print <<EOI;
+--------------------------------------------------------+
| Please file a bug report: http://perl.apache.org/bugs/ |
@@ -1402,12 +1402,12 @@
use base 'Apache::TestRun';
use Apache::TestConfig;
__PACKAGE__->new->run(@ARGV);
-
+
sub pre_configure {
my $self = shift;
# Don't load an installed mod_apreq
Apache::TestConfig::autoconfig_skip_module_add('mod_apreq.c');
-
+
$self->SUPER::pre_configure();
}
Modified: perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm Mon Dec 31 00:00:09 2007
@@ -199,7 +199,7 @@
and C</my/local/apache/bin/httpd> will be propagated throughout the
rest of the process. note that PHP needs to be active within Apache
-prior to configuring the test framework as shown above, either by
+prior to configuring the test framework as shown above, either by
virtue of PHP being compiled into the C<httpd> binary statically or
through an active C<LoadModule> statement within the configuration
located in C</my/local/apache/conf/httpd.conf>. Other required modules
@@ -268,7 +268,7 @@
the include library C<test-more.php> is automatically generated by
C<Apache::TestConfigPHP> and configurations tweaked in such a
-a way that your PHP scripts can find it without issue. the
+a way that your PHP scripts can find it without issue. the
functions provided by C<test-more.php> are equivalent in name and
function to those in C<Test::More>, a standard Perl testing
library, so you can see that manpage for details on the syntax
@@ -276,10 +276,10 @@
at this point, we have enough in place to run some tests from
PHP-land - a C<Makefile.PL> to configure Apache for us, and
-a PHP script in C<t/response/TestFoo/bar.php> to send some
+a PHP script in C<t/response/TestFoo/bar.php> to send some
results out to the testing engine. issuing C<make test>
would start Apache, issue the request to C<bar.php>, generate
-a report, and shut down Apache. the report would look like
+a report, and shut down Apache. the report would look like
something like this after running the tests in verbose mode
(eg C<make test TEST_VERBOSE=1>):
Modified: perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm Mon Dec 31 00:00:09 2007
@@ -54,7 +54,7 @@
# in 0.9.7 s/Email/emailAddress/ in DN
my $email_field = Apache::Test::normalize_vstring($version) <
- Apache::Test::normalize_vstring("0.9.7") ?
+ Apache::Test::normalize_vstring("0.9.7") ?
"Email" : "emailAddress";
my $ca_dn = {
@@ -214,7 +214,7 @@
challengePassword = $pass
[ ca ]
-default_ca = CA_default
+default_ca = CA_default
[ CA_default ]
certs = certs # Where the issued certs are kept
@@ -233,13 +233,13 @@
preserve = no # keep passed DN ordering
[ policy_anything ]
-countryName = optional
-stateOrProvinceName = optional
-localityName = optional
-organizationName = optional
-organizationalUnitName = optional
-commonName = supplied
-emailAddress = optional
+countryName = optional
+stateOrProvinceName = optional
+localityName = optional
+organizationName = optional
+organizationalUnitName = optional
+commonName = supplied
+emailAddress = optional
[ comment ]
nsComment = This Is A Comment
Modified: perl/Apache-Test/trunk/lib/Apache/TestServer.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestServer.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestServer.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestServer.pm Mon Dec 31 00:00:09 2007
@@ -306,9 +306,9 @@
# debug httpd startup code. 6.5 has been proven
# to work. FreeBSD typically installs this as
# gdb65.
- # Is it worth it to check the debugger and os version
+ # Is it worth it to check the debugger and os version
# and die ?
-
+
unless (grep { /^$opts->{debugger}/ } keys %debuggers) {
error "$opts->{debugger} is not a supported debugger",
"These are the supported debuggers: ".
@@ -316,7 +316,7 @@
die("\n");
}
- my $debugger = $opts->{debugger};
+ my $debugger = $opts->{debugger};
$debugger =~ s/\d+$//;
my $method = "start_" . $debuggers{$debugger};
Modified: perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm Mon Dec 31 00:00:09 2007
@@ -282,7 +282,7 @@
# this is a special mode, which really just runs 't/TEST -start;
# t/TEST -run; t/TEST -stop;' but it runs '-run' separately for each
-# test, and checks whether anything bad has happened after the run
+# test, and checks whether anything bad has happened after the run
# of each test (i.e. either a test has failed, or a test may be successful,
# but server may have dumped a core file, we detect that).
sub run_bug_mode {
@@ -316,7 +316,7 @@
($self->{times} > 1 ? "s" : "");
# first time run all tests, or all specified tests
- my @tests = @{ $self->{tests} }; # copy
+ my @tests = @{ $self->{tests} }; # copy
my $bad = $self->run_test($iter, $reduce_iter, \@tests, \@good);
unless ($bad) {
$self->{total_iterations}++;
@@ -420,7 +420,7 @@
my $c = 0;
return sub {
- $c++; # remember stream's state
+ $c++; # remember stream's state
# a single item is not reduce-able
return \@items if $items == 1;
@@ -659,7 +659,7 @@
my $unique_seqs = scalar keys %{ $self->{results} };
my $attempts = $self->{total_reduction_attempts};
my $successes = $self->{total_reduction_successes};
- my $completion = $self->{smoking_completed}
+ my $completion = $self->{smoking_completed}
? "Completed"
: "Not Completed (aborted by user)";
@@ -931,16 +931,16 @@
I<t/SMOKE.PL> is driving this module, if you don't have it, create it:
#!perl
-
+
use strict;
use warnings FATAL => 'all';
-
+
use FindBin;
use lib "$FindBin::Bin/../Apache-Test/lib";
use lib "$FindBin::Bin/../lib";
-
+
use Apache::TestSmoke ();
-
+
Apache::TestSmoke->new(@ARGV)->run;
usually I<Makefile.PL> converts it into I<t/SMOKE> while adjusting the
Modified: perl/Apache-Test/trunk/lib/Apache/TestTrace.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestTrace.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestTrace.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestTrace.pm Mon Dec 31 00:00:09 2007
@@ -96,7 +96,7 @@
sub c_trace {
my ($level, $prefix_type) = (shift, shift);
my $prefix = prefix($prefix_type);
- print $LogFH
+ print $LogFH
map { "$colors{$level}$prefix$_$colors{reset}\n"}
grep defined($_), expand(@_);
}
@@ -104,8 +104,8 @@
sub nc_trace {
my ($level, $prefix_type) = (shift, shift);
my $prefix = prefix($prefix_type);
- print $LogFH
- map { sprintf "[%7s] %s%s\n", $level, $prefix, $_ }
+ print $LogFH
+ map { sprintf "[%7s] %s%s\n", $level, $prefix, $_ }
grep defined($_), expand(@_);
}
@@ -126,10 +126,10 @@
}
sub trace_level {
- # overriden by user/-trace
+ # overriden by user/-trace
(defined $Level && $levels{$Level}) ||
# or overriden by env var
- (exists $ENV{APACHE_TEST_TRACE_LEVEL} &&
+ (exists $ENV{APACHE_TEST_TRACE_LEVEL} &&
$levels{$ENV{APACHE_TEST_TRACE_LEVEL}}) ||
# or default
$levels{$default_level};
@@ -145,39 +145,39 @@
=head1 SYNOPSIS
use Apache::TestTrace;
-
+
debug "foo bar";
-
+
info_sub "missed it";
-
+
error_mark "something is wrong";
# test sub that exercises all the tracing functions
sub test {
- print $Apache::TestTrace::LogFH
+ print $Apache::TestTrace::LogFH
"TraceLevel: $Apache::TestTrace::Level\n";
$_->($_,[1..3],$_) for qw(emerg alert crit error
warning notice info debug todo);
print $Apache::TestTrace::LogFH "\n\n"
};
-
+
# demo the trace subs using default setting
test();
-
+
{
# override the default trace level with 'crit'
local $Apache::TestTrace::Level = 'crit';
# now only 'crit' and higher levels will do tracing lower level
test();
}
-
+
{
# set the trace level to 'debug'
local $Apache::TestTrace::Level = 'debug';
# now only 'debug' and higher levels will do tracing lower level
test();
}
-
+
{
open OUT, ">/tmp/foo" or die $!;
# override the default Log filehandle
@@ -186,10 +186,10 @@
test();
close OUT;
}
-
+
# override tracing level via -trace opt
% t/TEST -trace=debug
-
+
# override tracing level via env var
% env APACHE_TEST_TRACE_LEVEL=debug t/TEST
Modified: perl/Apache-Test/trunk/lib/Apache/TestUtil.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestUtil.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestUtil.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestUtil.pm Mon Dec 31 00:00:09 2007
@@ -43,7 +43,7 @@
);
@EXPORT_OK = qw(t_write_perl_script t_write_shell_script t_chown
- t_catfile_apache t_catfile
+ t_catfile_apache t_catfile
t_start_error_log_watch t_finish_error_log_watch);
%CLEAN = ();
@@ -132,7 +132,7 @@
sub t_cmp ($$;$) {
- Carp::carp(join(":", (caller)[1..2]) .
+ Carp::carp(join(":", (caller)[1..2]) .
' usage: $res = t_cmp($received, $expected, [$comment])')
if @_ < 2 || @_ > 3;
@@ -364,7 +364,7 @@
}
}
-my $banner_format =
+my $banner_format =
"\n*** The following %s expected and harmless ***\n";
sub is_expected_banner {
@@ -767,9 +767,9 @@
use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest qw(GET);
-
+
plan tests => 1;
-
+
t_client_log_error_is_expected();
my $url = "/error_document/cannot_be_found";
my $res = GET($url);
@@ -779,7 +779,7 @@
similar to the following snippet:
*** The following error entry is expected and harmless ***
- [Tue Apr 01 14:02:55 2003] [error] [client 127.0.0.1]
+ [Tue Apr 01 14:02:55 2003] [error] [client 127.0.0.1]
File does not exist: /tmp/test/t/htdocs/error
When more than one entry is expected, an optional numerical argument,