git.shiar.nl
/
perl
/
plp
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
t/50-cgi: distinguish runtime warnings in output
[perl/plp/.git]
/
t
/
50-cgi.t
diff --git
a/t/50-cgi.t
b/t/50-cgi.t
index d29fcd017bdcdc701b53a0ecbcdafa984208954c..111e112beeede499f056d763c356f8649ee33a85 100644
(file)
--- a/
t/50-cgi.t
+++ b/
t/50-cgi.t
@@
-40,12
+40,22
@@
sub plp_is {
open STDOUT, '>', \my $output; # STDOUT buffered to scalar
select STDOUT; # output before start() (which selects PLPOUT)
eval {
open STDOUT, '>', \my $output; # STDOUT buffered to scalar
select STDOUT; # output before start() (which selects PLPOUT)
eval {
- local $SIG{__WARN__} = sub { print $_[0] }; # enables warnings
+ local $SIG{__WARN__} = sub {
+ # include warnings in stdout (but modified to distinguish)
+ my $msg = shift;
+ my $eol = $msg =~ s/(\s*\z)// && $1;
+ print "<warning>$msg</warning>$eol"
+ };
PLP::everything();
};
PLP::everything();
};
+ my $failure = $@;
select ORGOUT; # return to original STDOUT
select ORGOUT; # return to original STDOUT
- not $@ or fail($test), diag(" Error: $@"), return;
+ if ($failure) {
+ fail($test);
+ diag(" Error: $failure");
+ return;
+ }
$output =~ s{((?:.+\n)*)}{ join "", sort split /(?<=\n)/, $1 }e; # order headers
is($output, $expect, $test);
}
$output =~ s{((?:.+\n)*)}{ join "", sort split /(?<=\n)/, $1 }e; # order headers
is($output, $expect, $test);
}
@@
-57,7
+67,9
@@
sub getwarning {
local $SIG{__WARN__} = sub { die @_ };
# warnings module runs at BEGIN, so we need to use icky expression evals
eval qq(# line $line "$file"\n$code; return);
local $SIG{__WARN__} = sub { die @_ };
# warnings module runs at BEGIN, so we need to use icky expression evals
eval qq(# line $line "$file"\n$code; return);
- return $@;
+ my $res = $@;
+ chomp $res;
+ return $res;
};
%ENV = (
};
%ENV = (
@@
-117,7
+129,8
@@
unlink "$base/$testfile.inc";
my $SYNTAXERR = getwarning("q\cq\n\cq; syntax(error", 1, $testfile);
plp_is('fatal error', "runtime\n<: syntax(error :>\nruntime", <<TEST);
$HEAD
my $SYNTAXERR = getwarning("q\cq\n\cq; syntax(error", 1, $testfile);
plp_is('fatal error', "runtime\n<: syntax(error :>\nruntime", <<TEST);
$HEAD
-<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$SYNTAXERR</td></tr></table>
+<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$SYNTAXERR
+</td></tr></table>
TEST
SKIP: {
TEST
SKIP: {
@@
-140,9
+153,10
@@
plp_is('warnings', split /\n\n/, <<TEST, 2);
6
$HEAD
6
$HEAD
-${VOIDWARN}1
+<warning>${VOIDWARN}</warning>
+1
2
2
-3
warning at $testfile line 3.
+3
<warning>warning at $testfile line 3.</warning>
4<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$INCWARN at $testfile line 4.
</td></tr></table>
4<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$INCWARN at $testfile line 4.
</td></tr></table>
@@
-179,8
+193,8
@@
plp_is('%ENV (on apache)', @envtest);
SKIP: {
chmod 0244, $testfile or skip("changed permissions", 1);
plp_is('permission denied', undef, <<TEST);
SKIP: {
chmod 0244, $testfile or skip("changed permissions", 1);
plp_is('permission denied', undef, <<TEST);
+<warning>PLP: Can't read: $base/$testfile (/$testfile/test/123)</warning>
Content-Type: text/html
Content-Type: text/html
-PLP: Can't read: $base/$testfile (/$testfile/test/123)
Status: 403
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
Status: 403
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
@@
-197,8
+211,8
@@
chmod 0644, $testfile;
$ENV{PATH_TRANSLATED} = "$base/missinginclude/test/123";
plp_is('not found', undef, <<TEST);
$ENV{PATH_TRANSLATED} = "$base/missinginclude/test/123";
plp_is('not found', undef, <<TEST);
+<warning>PLP: Not found: $base/missinginclude/test/123 (/$testfile/test/123)</warning>
Content-Type: text/html
Content-Type: text/html
-PLP: Not found: $base/missinginclude/test/123 (/$testfile/test/123)
Status: 404
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
Status: 404
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">