coar 02/01/03 09:06:36
Modified: perl-framework/t/modules access.t
Log:
Re-do with t_debug after Stas showed me the light.
Revision Changes Path
1.10 +16 -18 httpd-test/perl-framework/t/modules/access.t
Index: access.t
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/t/modules/access.t,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- access.t 3 Jan 2002 02:35:17 -0000 1.9
+++ access.t 3 Jan 2002 17:06:36 -0000 1.10
@@ -3,6 +3,7 @@
use Apache::Test;
use Apache::TestRequest;
+use Apache::TestUtil;
##
## mod_access test
@@ -48,15 +49,14 @@
$config_string = "Order $order\nAllow $allow\n";
write_htaccess($config_string);
- print "#---\n# ",
- join("\n# ", split(/\n/, $config_string)), "\n";
+ t_debug "---", $config_string;
if ($order eq 'deny,allow') {
## if allowing by default,
## there is no 'Deny' directive, so everything
## is allowed.
- print "# expecting access.\n";
+ t_debug "expecting access.";
ok GET_OK "/modules/access/htaccess/index.html";
@@ -69,13 +69,13 @@
|| $allow eq 'from all') {
## if we are explicitly allowed, its ok
- print "# expecting access.\n";
+ t_debug "expecting access.";
ok GET_OK "/modules/access/htaccess/index.html";
} else {
## otherwise, not ok
- print "# expecting access denial.\n";
+ t_debug "expecting access denial.";
ok !GET_OK "/modules/access/htaccess/index.html";
}
}
@@ -85,8 +85,7 @@
$config_string = "Order $order\nDeny $deny\n";
write_htaccess($config_string);
- print "#---\n# ",
- join("\n# ", split(/\n/, $config_string)), "\n";
+ t_debug "---", $config_string;
if ($order eq 'deny,allow') {
@@ -98,13 +97,13 @@
## if we are denied explicitly
## its not ok
- print "# expecting access denial.\n";
+ t_debug "expecting access denial.";
ok !GET_OK "/modules/access/htaccess/index.html";
} else {
## otherwise, ok
- print "# expecting access.\n";
+ t_debug "expecting access.";
ok GET_OK "/modules/access/htaccess/index.html";
}
@@ -113,7 +112,7 @@
## if denying by default
## there is no 'Allow' directive, so
## everything is denied.
- print "# expecting access denial.\n";
+ t_debug "expecting access denial.";
ok !GET_OK "/modules/access/htaccess/index.html";
}
@@ -121,8 +120,7 @@
$config_string = "Order $order\nAllow $allow\nDeny $deny\n";
write_htaccess($config_string);
- print "#---\n# ",
- join("\n# ", split(/\n/, $config_string)), "\n";
+ t_debug "---", $config_string;
if ($order eq 'deny,allow') {
@@ -134,7 +132,7 @@
## we are explicitly allowed
## so it is ok.
- print "# expecting access.\n";
+ t_debug "expecting access.";
ok GET_OK "/modules/access/htaccess/index.html";
} elsif ($deny =~ /^from $addr1/
@@ -144,7 +142,7 @@
## if we are not explicitly allowed
## and are explicitly denied,
## we are denied access.
- print "# expecting access denial.\n";
+ t_debug "expecting access denial.";
ok !GET_OK "/modules/access/htaccess/index.html";
} else {
@@ -152,7 +150,7 @@
## if we are not explicity allowed
## or explicitly denied,
## we get access.
- print "# expecting access.\n";
+ t_debug "expecting access.";
ok GET_OK "/modules/access/htaccess/index.html";
}
@@ -166,7 +164,7 @@
## if we are explicitly denied,
## we get no access.
- print "# expecting access denial.\n";
+ t_debug "expecting access denial.";
ok !GET_OK "/modules/access/htaccess/index.html";
} elsif ($allow =~ /^from $addr1/
@@ -176,7 +174,7 @@
## if we are not explicitly denied
## and are explicitly allowed,
## we get access.
- print "# expecting access.\n";
+ t_debug "expecting access.";
ok GET_OK "/modules/access/htaccess/index.html";
} else {
@@ -184,7 +182,7 @@
## if we are not explicitly denied
## and not explicitly allowed,
## we get no access.
- print "# expecting access denial.\n";
+ t_debug "expecting access denial.";
ok !GET_OK "/modules/access/htaccess/index.html";
}
