From 6b48397e14cca5fdcbfdd63eb2c00c2a46dce308 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Mon, 20 Feb 2012 02:16:58 +0100 Subject: [PATCH] t/50-cgi: distinguish runtime warnings in output Circumfix STDERR messages to clarify and delimit trigger. Causes different order in header lines due to comparison sort. --- t/50-cgi.t | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/t/50-cgi.t b/t/50-cgi.t index d29fcd0..111e112 100644 --- 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 { - 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 "$msg$eol" + }; PLP::everything(); }; + my $failure = $@; 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); } @@ -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); - return $@; + my $res = $@; + chomp $res; + return $res; }; %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", <Debug information:
$SYNTAXERR +
Debug information:
$SYNTAXERR +
TEST SKIP: { @@ -140,9 +153,10 @@ plp_is('warnings', split /\n\n/, <${VOIDWARN} +1 2 -3warning at $testfile line 3. +3warning at $testfile line 3. 4
Debug information:
$INCWARN at $testfile line 4.
@@ -179,8 +193,8 @@ plp_is('%ENV (on apache)', @envtest); SKIP: { chmod 0244, $testfile or skip("changed permissions", 1); plp_is('permission denied', undef, <PLP: Can't read: $base/$testfile (/$testfile/test/123) Content-Type: text/html -PLP: Can't read: $base/$testfile (/$testfile/test/123) Status: 403 @@ -197,8 +211,8 @@ chmod 0644, $testfile; $ENV{PATH_TRANSLATED} = "$base/missinginclude/test/123"; plp_is('not found', undef, <PLP: Not found: $base/missinginclude/test/123 (/$testfile/test/123) Content-Type: text/html -PLP: Not found: $base/missinginclude/test/123 (/$testfile/test/123) Status: 404 -- 2.30.0