Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1002165 -
 /httpd/test/framework/trunk/t/modules/negotiation.t
Date: Tue, 28 Sep 2010 13:55:18 -0000
To: cvs@httpd.apache.org
From: rjung@apache.org
Message-Id: <20100928135518.84A2F23889E1@eris.apache.org>

Author: rjung
Date: Tue Sep 28 13:55:18 2010
New Revision: 1002165

URL: http://svn.apache.org/viewvc?rev=1002165&view=rev
Log:
Fix test suite failure for 2.0:
- move test for PR 33112 into TODO
  if version < 2.2.15.

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

Modified: httpd/test/framework/trunk/t/modules/negotiation.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/negotiation.t?rev=1002165&r1=1002164&r2=1002165&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/negotiation.t (original)
+++ httpd/test/framework/trunk/t/modules/negotiation.t Tue Sep 28 13:55:18 2010
@@ -41,8 +41,13 @@ use Apache::TestUtil;
 my ($en, $fr, $de, $fu, $bu) = qw(en fr de fu bu);
 my @language = ($en, $fr, $de, $fu);
 my $tests = (@language * 3) + (@language * @language * 5) + 7;
+my @todo = ();
 
-plan tests => $tests,
+my $pr_33112_fix_version = '2.2.15';
+my $check_pr_33112 = have_min_apache_version($pr_33112_fix_version);
+@todo = ($tests) unless $check_pr_33112;
+
+plan tests => $tests, todo => \@todo,
     have_module 'negotiation' && have_cgi && have_module 'mime';
 
 my $actual;
@@ -162,9 +167,13 @@ my_chomp();
 ok t_cmp($actual, "index.html.$fr.gz",
          "bu has the highest quality but is non-existant, so fr is next best");
 
+# PR 33112
 $actual = GET_BODY "/modules/negotiation/query/test?foo";
 print "# GET /modules/negotiation/query/test?foo\n";
 my_chomp();
 ok t_cmp($actual, "QUERY_STRING --> foo",
          "The type map gives the script the highest quality;"
          . "\nthe request included a query string");
+if (!$check_pr_33112) {
+    print STDERR "TODO: Fix for query string preservation after content negotiation (PR 33112 not fixed before $pr_33112_fix_version).\n";
+}