stas 2003/03/31 20:39:30
Modified: t/hooks trans.t
t/response/TestError runtime.pm syntax.pm
t/response/TestModperl setauth.pm
Log:
use the newly added t_{client|server}_log_{error|warn}_is_expected()
helper functions to disambiguate expected errors from real ones
Revision Changes Path
1.4 +2 -0 modperl-2.0/t/hooks/trans.t
Index: trans.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/hooks/trans.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- trans.t 6 Apr 2002 07:00:36 -0000 1.3
+++ trans.t 1 Apr 2003 04:39:30 -0000 1.4
@@ -2,6 +2,7 @@
use warnings FATAL => 'all';
use Apache::Test;
+use Apache::TestUtil;
use Apache::TestRequest;
use Apache2 ();
@@ -9,6 +10,7 @@
plan tests => 3;
+t_client_log_error_is_expected();
ok GET_RC('/nope') == NOT_FOUND;
my $module = '/TestHooks/trans.pm';
1.2 +3 -1 modperl-2.0/t/response/TestError/runtime.pm
Index: runtime.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestError/runtime.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- runtime.pm 23 Jan 2003 01:32:21 -0000 1.1
+++ runtime.pm 1 Apr 2003 04:39:30 -0000 1.2
@@ -6,6 +6,8 @@
use Apache::RequestRec ();
use Apache::RequestIO ();
+use Apache::TestUtil;
+
use Apache::Const -compile => qw(OK);
sub handler {
@@ -13,7 +15,7 @@
$r->content_type('text/plain');
- warn "a call to a non-existing function\n";
+ t_server_log_error_is_expected();
no_such_func();
$r->print('ok');
1.2 +5 -0 modperl-2.0/t/response/TestError/syntax.pm
Index: syntax.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestError/syntax.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syntax.pm 23 Jan 2003 01:32:21 -0000 1.1
+++ syntax.pm 1 Apr 2003 04:39:30 -0000 1.2
@@ -1,5 +1,10 @@
package TestError::syntax;
+BEGIN {
+ use Apache::TestUtil;
+ t_server_log_error_is_expected();
+}
+
use strict;
use warnings FATAL => 'all';
1.2 +1 -0 modperl-2.0/t/response/TestModperl/setauth.pm
Index: setauth.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/setauth.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- setauth.pm 22 Oct 2002 15:13:22 -0000 1.1
+++ setauth.pm 1 Apr 2003 04:39:30 -0000 1.2
@@ -17,6 +17,7 @@
ok t_cmp(undef, $r->auth_type(), 'auth_type');
+ t_server_log_error_is_expected();
$r->get_basic_auth_pw();
ok t_cmp('Basic', $r->auth_type(), 'default auth_type');
