httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-test/perl-framework/t/modules access.t
Date Tue, 10 Sep 2002 06:46:41 GMT
jerenkrantz    2002/09/09 23:46:41

  Modified:    perl-framework/Apache-Test/lib/Apache Test.pm TestConfig.pm
               perl-framework/t/conf extra.conf.in
               perl-framework/t/modules access.t
  Log:
  Allow test framework to work with either mod_access or mod_authz_host
  
  Revision  Changes    Path
  1.48      +5 -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.47
  retrieving revision 1.48
  diff -u -u -r1.47 -r1.48
  --- Test.pm	11 Jul 2002 05:18:49 -0000	1.47
  +++ Test.pm	10 Sep 2002 06:46:41 -0000	1.48
  @@ -12,7 +12,7 @@
   
   @ISA = qw(Exporter);
   @EXPORT = qw(ok skip sok plan have have_lwp have_http11
  -             have_cgi have_module have_apache have_perl);
  +             have_cgi have_access have_module have_apache have_perl);
   $VERSION = '0.01';
   
   %SubTests = ();
  @@ -198,6 +198,10 @@
   
   sub have_cgi {
       have_module('cgi') || have_module('cgid');
  +}
  +
  +sub have_access {
  +    have_module('access') || have_module('authz_host');
   }
   
   sub have_apache {
  
  
  
  1.142     +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.141
  retrieving revision 1.142
  diff -u -u -r1.141 -r1.142
  --- TestConfig.pm	14 Aug 2002 02:31:11 -0000	1.141
  +++ TestConfig.pm	10 Sep 2002 06:46:41 -0000	1.142
  @@ -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)),
  +   (map { $_ . '_module_name', "$_ module name"} qw(cgi ssl thread access)),
   );
   
   sub usage {
  @@ -232,6 +232,7 @@
       $self->default_module(cgi    => [qw(mod_cgi mod_cgid)]);
       $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->{hostport} = $self->hostport;
   
  
  
  
  1.42      +2 -2      httpd-test/perl-framework/t/conf/extra.conf.in
  
  Index: extra.conf.in
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/conf/extra.conf.in,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -u -r1.41 -r1.42
  --- extra.conf.in	5 Jun 2002 07:42:25 -0000	1.41
  +++ extra.conf.in	10 Sep 2002 06:46:41 -0000	1.42
  @@ -207,10 +207,10 @@
   </IfModule>
   
   ##
  -## mod_access test config
  +## @ACCESS_MODULE@ test config
   ##
   
  -<IfModule mod_access.c>
  +<IfModule @ACCESS_MODULE@>
       <Directory @SERVERROOT@/htdocs/modules/access/htaccess>
           AllowOverride Limit
       </Directory>
  
  
  
  1.11      +1 -2      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.10
  retrieving revision 1.11
  diff -u -u -r1.10 -r1.11
  --- access.t	3 Jan 2002 17:06:36 -0000	1.10
  +++ access.t	10 Sep 2002 06:46:41 -0000	1.11
  @@ -30,8 +30,7 @@
   my @allow = @localhost;
   my @deny = @localhost;
   
  -plan tests => (@order * @allow * @deny * 2) + (@order * @allow),
  -    have_module 'access';
  +plan tests => (@order * @allow * @deny * 2) + (@order * @allow), \&have_access;
   
   my $dir = $vars->{t_dir};
   $dir .=  "/htdocs/modules/access/htaccess";
  
  
  

Mime
View raw message