cvs commit: modperl-2.0/t/response/TestAPI aplog.pm

[geoff]

geoff       2004/09/30 11:06:55

  Modified:    t/response/TestAPI aplog.pm
  Log:
  tweaks for new 2.1 error strings
  Submitted by: joe orton
  
  Revision  Changes    Path
  1.22      +6 -1      modperl-2.0/t/response/TestAPI/aplog.pm
  
  Index: aplog.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/aplog.pm,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- aplog.pm  24 Sep 2004 19:55:35 -0000      1.21
  +++ aplog.pm  30 Sep 2004 18:06:55 -0000      1.22
  @@ -74,11 +74,16 @@
               qr/: log_serror test 1$/m,
               '$s->log_serror(__FILE__, __LINE__, LOG_DEBUG...)';
   
  +        # the APR_EGENERAL error string changed for APR 1.0
  +        my $egeneral = have_min_apache_version('2.1.0')
  +           ? "Internal error"
  +           : "Error string not specified yet";
  +
           t_server_log_warn_is_expected();
           $s->log_serror(Apache::Log::LOG_MARK, Apache::LOG_DEBUG,
                          APR::EGENERAL, "log_serror test 2");
           ok t_cmp $logdiff->diff,
  -            qr/Error string not specified yet: log_serror test 2/,
  +            qr/$egeneral: log_serror test 2/,
               '$s->log_serror(LOG_MARK, LOG_DEBUG, APR::EGENERAL...)';
       }