svn commit: r1002205 - /httpd/test/framework/trunk/t/modules/expires.t

[rj...@apache.org]

Author: rjung
Date: Tue Sep 28 15:02:47 2010
New Revision: 1002205

URL: http://svn.apache.org/viewvc?rev=1002205&view=rev
Log:
Fix test suite failure for 2.0:
- move test expires time in the past into TODO
  if version < 2.2.11
  (missing backport of r713142 in 2.0).

Modified:
    httpd/test/framework/trunk/t/modules/expires.t

Modified: httpd/test/framework/trunk/t/modules/expires.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/expires.t?rev=1002205&r1=1002204&r2=1002205&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/expires.t (original)
+++ httpd/test/framework/trunk/t/modules/expires.t Tue Sep 28 15:02:47 2010
@@ -228,6 +228,9 @@ sub expires_test {
 
     my $expected = '';
     my $exp_type = '';
+    my $r713142_version = '2.2.11';
+    my $check_r713142 = have_min_apache_version($r713142_version);
+    my $ignore = 0;
     if ($exp_conf =~ /^([A|M])(\d+)$/) {
         $exp_type = $1;
         $expected = $2;
@@ -237,6 +240,10 @@ sub expires_test {
         if (($exp_type eq 'M')
             && ($headers{access} > $headers{modified} + $expected)) {
             $expected = $headers{access} - $headers{modified};
+            if (!$check_r713142) {
+                $ignore = 1;
+                print STDERR "\nTODO: Fix for expiration date being in the past (r713142 not backported before $r713142_version).\n";
+            }
         }
     } else {
         print STDERR "\n\ndoom: $exp_conf\n\n";
@@ -252,7 +259,7 @@ sub expires_test {
 
     print "# debug: expected: $expected\n";
     print "# debug: actual  : $actual\n";
-    return ($actual == $expected);
+    return ($actual == $expected) || $ignore;
 
 }