X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fpsgi-log.t;h=9e269c3882ca876028194386f47e21966e1d4989;hb=dc356cbaae15dbfe3bb0385f4cec5f6d07c08df5;hp=2d9e2c08de2b04d16fd7aad05ac0be653687f598;hpb=a11b553f6a879aa293386df5dd55696adce082ce;p=catagits%2FCatalyst-Runtime.git diff --git a/t/psgi-log.t b/t/psgi-log.t index 2d9e2c0..9e269c3 100644 --- a/t/psgi-log.t +++ b/t/psgi-log.t @@ -46,8 +46,10 @@ use HTTP::Request::Common; no Moose; } +my $cmp = TestApp->debug ? '>=' : '=='; -subtest "psgi.errors" => sub{ +#subtest "psgi.errors" => sub +{ my $handle = MockHandle->new(); my $app = builder { @@ -69,12 +71,13 @@ subtest "psgi.errors" => sub{ my $cb = shift; my $res = $cb->(GET "/log/debug"); my @logs = $handle->logs; - is(scalar(@logs), 1, "one event output"); - like($logs[0], qr/debug$/, "event matches test data"); + cmp_ok(scalar(@logs), $cmp, 1, "psgi.errors: one event output"); + like($logs[0], qr/debug$/m, "psgi.errors: event matches test data"); }; }; -subtest "psgix.logger" => sub { +#subtest "psgix.logger" => sub +{ my @logs; my $logger = sub { @@ -95,8 +98,9 @@ subtest "psgix.logger" => sub { test_psgi $app, sub { my $cb = shift; my $res = $cb->(GET "/log/debug"); - is(scalar(@logs), 1, "one event logged"); - is_deeply($logs[0], { level => 'debug', message => "debug" }, "right stuff"); + cmp_ok(scalar(@logs), $cmp, 1, "psgix.logger: one event logged"); + is(scalar(grep { $_->{level} eq 'debug' and $_->{message} eq 'debug' } @logs), + 1, "psgix.logger: right stuff"); }; };