You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by je...@apache.org on 2002/09/30 23:21:44 UTC
cvs commit: httpd-test/perl-framework/t/ssl basicauth.t
jerenkrantz 2002/09/30 14:21:44
Modified: perl-framework/Apache-Test/lib/Apache Test.pm TestConfig.pm
perl-framework/t/conf/ssl ssl.conf.in
perl-framework/t/ssl basicauth.t
Log:
Allow ssl/basicauth.t test to work by conditionally determining what auth
modules we have available.
Revision Changes Path
1.49 +6 -1 httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm
Index: Test.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -u -r1.48 -r1.49
--- Test.pm 10 Sep 2002 06:46:41 -0000 1.48
+++ Test.pm 30 Sep 2002 21:21:44 -0000 1.49
@@ -12,7 +12,8 @@
@ISA = qw(Exporter);
@EXPORT = qw(ok skip sok plan have have_lwp have_http11
- have_cgi have_access have_module have_apache have_perl);
+ have_cgi have_access have_auth have_module
+ have_apache have_perl);
$VERSION = '0.01';
%SubTests = ();
@@ -202,6 +203,10 @@
sub have_access {
have_module('access') || have_module('authz_host');
+}
+
+sub have_auth {
+ have_module('auth') || have_module('auth_basic');
}
sub have_apache {
1.143 +2 -1 httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -u -r1.142 -r1.143
--- TestConfig.pm 10 Sep 2002 06:46:41 -0000 1.142
+++ TestConfig.pm 30 Sep 2002 21:21:44 -0000 1.143
@@ -52,7 +52,7 @@
proxyssl_url => 'url for testing ProxyPass / https (default is localhost)',
sslca => 'location of SSL CA (default is $t_conf/ssl/ca)',
sslcaorg => 'SSL CA organization to use for tests (default is asf)',
- (map { $_ . '_module_name', "$_ module name"} qw(cgi ssl thread access)),
+ (map { $_ . '_module_name', "$_ module name"} qw(cgi ssl thread access auth)),
);
sub usage {
@@ -233,6 +233,7 @@
$self->default_module(thread => [qw(worker threaded)]);
$self->default_module(ssl => [qw(mod_ssl)]);
$self->default_module(access => [qw(mod_access mod_authz_host)]);
+ $self->default_module(auth => [qw(mod_auth mod_auth_basic)]);
$self->{hostport} = $self->hostport;
1.21 +1 -1 httpd-test/perl-framework/t/conf/ssl/ssl.conf.in
Index: ssl.conf.in
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/t/conf/ssl/ssl.conf.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -u -r1.20 -r1.21
--- ssl.conf.in 17 May 2002 07:02:15 -0000 1.20
+++ ssl.conf.in 30 Sep 2002 21:21:44 -0000 1.21
@@ -109,7 +109,7 @@
SSLVerifyDepth 10
</Location>
- <IfModule mod_auth.c>
+ <IfModule @AUTH_MODULE@>
<Location /ssl-fakebasicauth>
SSLVerifyClient require
SSLVerifyDepth 5
1.5 +1 -1 httpd-test/perl-framework/t/ssl/basicauth.t
Index: basicauth.t
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/t/ssl/basicauth.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- basicauth.t 2 Apr 2002 17:56:03 -0000 1.4
+++ basicauth.t 30 Sep 2002 21:21:44 -0000 1.5
@@ -13,7 +13,7 @@
my $url = '/ssl-fakebasicauth/index.html';
-plan tests => 3, have_module 'auth';
+plan tests => 3, \&have_auth;
Apache::TestRequest::scheme('https');