cvs commit: httpd-test/perl-framework/t/apache etags.t

[dougm]

dougm       02/01/10 12:02:30

  Modified:    perl-framework/t/apache etags.t
  Log:
  backing out last change
  
  Revision  Changes    Path
  1.3       +16 -2     httpd-test/perl-framework/t/apache/etags.t
  
  Index: etags.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/apache/etags.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- etags.t   10 Jan 2002 17:51:48 -0000      1.2
  +++ etags.t   10 Jan 2002 20:02:30 -0000      1.3
  @@ -8,6 +8,20 @@
   use Apache::TestRequest;
   use Apache::TestUtil;
   
  +t_debug "Checking for existence of FileETag directive\n";
  +my $resp = GET('/etags/test.txt');
  +my $rc = $resp->code;
  +t_debug "Returned $rc:";
  +if ($rc == 500) {
  +    t_debug "Feature not supported, skipping..",
  +        " Message was:", $resp->as_string;
  +    if (defined($resp->content)) {
  +        t_debug $resp->content;
  +    }
  +    plan tests => 1..0;
  +    exit;
  +}
  +
   #
   # The tests verify the inclusion of the different fields, and
   # inheritance, according to the directories involved.  All are
  @@ -122,14 +136,14 @@
                );
   
   my $testcount = scalar(keys(%tests));
  -plan tests => $testcount, sub { have_apache(1) };
  +plan tests => $testcount;
   
   for my $key (keys(%tests)) {
       my $uri = "/etags" . $key . "test.txt";
       my $pattern = $tests{$key};
       t_debug "---", "HEAD $uri",
           "Expecting " . $expect{$pattern};
  -    my $resp = HEAD($uri);
  +    $resp = HEAD($uri);
       my $etag = $resp->header("ETag");
       if (defined($etag)) {
           t_debug "Received $etag";