svn commit: r1832507 - /httpd/test/framework/trunk/t/modules/proxy.t

[yl...@apache.org]

Author: ylavic
Date: Tue May 29 22:57:31 2018
New Revision: 1832507

URL: http://svn.apache.org/viewvc?rev=1832507&view=rev
Log:
Tests from r1832275 and r1832283 work in trunk only for now.

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

Modified: httpd/test/framework/trunk/t/modules/proxy.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/proxy.t?rev=1832507&r1=1832506&r2=1832507&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/proxy.t (original)
+++ httpd/test/framework/trunk/t/modules/proxy.t Tue May 29 22:57:31 2018
@@ -7,10 +7,13 @@ use Apache::TestUtil;
 use Apache::TestConfig ();
 use Misc;
 
-my $num_tests = 23 + 6;
+my $num_tests = 23;
 if (have_min_apache_version('2.4.7')) {
     $num_tests += 2;
 }
+if (have_min_apache_version('2.5') && have_module('lua')) {
+    $num_tests += 6;
+}
 plan tests => $num_tests, need need_module 'proxy', need_module 'setenvif';
 
 Apache::TestRequest::module("proxy_http_reverse");
@@ -98,7 +101,7 @@ chomp $c;
 ok t_cmp($c, "hello world", "ProxyPass not-proxied content OK");
 
 # Testing ProxyPassReverseCookieDomain and ProxyPassReverseCookiePath
-if (have_module('lua')) {
+if (have_min_apache_version('2.5') && have_module('lua')) {
     # '/' is escaped as %2F
     # ';' is escaped as %3B
     # '=' is escaped as %3D    
@@ -114,9 +117,6 @@ if (have_module('lua')) {
     ok t_cmp($r->code, 200, "Lua executed");
     ok t_cmp($r->header("Set-Cookie"), "domain=remote;path=/remote;foo=bar", "'Set-Cookie path=' wrongly updated by ProxyPassReverseCookiePath and/or ProxyPassReverseCookieDomain");
 }
-else { 
-    skip "skipping tests which need mod_lua" foreach (1..6);
-}
 
 if (have_module('alias')) {
     $r = GET("/reverse/perm");