You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2019/01/25 13:52:36 UTC
svn commit: r1852131 - in /httpd/test/framework/trunk/t: conf/proxy.conf.in
modules/proxy_balancer.t
Author: rjung
Date: Fri Jan 25 13:52:36 2019
New Revision: 1852131
URL: http://svn.apache.org/viewvc?rev=1852131&view=rev
Log:
Make new balancer tests conditional on the
loaded lb modules.
Modified:
httpd/test/framework/trunk/t/conf/proxy.conf.in
httpd/test/framework/trunk/t/modules/proxy_balancer.t
Modified: httpd/test/framework/trunk/t/conf/proxy.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/proxy.conf.in?rev=1852131&r1=1852130&r2=1852131&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/proxy.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/proxy.conf.in Fri Jan 25 13:52:36 2019
@@ -24,51 +24,51 @@
</VirtualHost>
<VirtualHost proxy_http_balancer>
+
+ <IfModule mod_lbmethod_byrequests.c>
<Proxy balancer://foo1>
BalancerMember http://@SERVERNAME@:@PROXY_HTTP_BAL1_PORT@ loadfactor=1
BalancerMember http://@SERVERNAME@:@PROXY_HTTP_BAL2_PORT@ loadfactor=1
</Proxy>
+ ProxySet balancer://foo1 lbmethod=byrequests
+ <Location /baltest1>
+ ProxyPass balancer://foo1/
+ </Location>
+ </IfModule>
+ <IfModule mod_lbmethod_mod_lbmethod_byrequests.c>
<Proxy balancer://foo2>
BalancerMember http://@SERVERNAME@:@PROXY_HTTP_BAL1_PORT@ loadfactor=1
BalancerMember http://@SERVERNAME@:@PROXY_HTTP_BAL2_PORT@ loadfactor=1
</Proxy>
+ ProxySet balancer://foo2 lbmethod=bytraffic
+ <Location /baltest2>
+ ProxyPass balancer://foo2/
+ </Location>
+ </IfModule>
+ <IfModule mod_lbmethod_bybusyness.c>
<Proxy balancer://foo3>
BalancerMember http://@SERVERNAME@:@PROXY_HTTP_BAL1_PORT@ loadfactor=1
BalancerMember http://@SERVERNAME@:@PROXY_HTTP_BAL2_PORT@ loadfactor=1
</Proxy>
+ ProxySet balancer://foo3 lbmethod=bybusyness
+ <Location /baltest3>
+ ProxyPass balancer://foo3/
+ </Location>
+ </IfModule>
+ <IfModule mod_lbmethod_heartbeat.c>
<Proxy balancer://foo4>
BalancerMember http://@SERVERNAME@:@PROXY_HTTP_BAL1_PORT@ loadfactor=1
BalancerMember http://@SERVERNAME@:@PROXY_HTTP_BAL2_PORT@ loadfactor=1
</Proxy>
-
- ProxySet balancer://foo1 lbmethod=byrequests
- ProxySet balancer://foo2 lbmethod=bytraffic
- ProxySet balancer://foo3 lbmethod=bybusyness
- <IfVersion >= 2.3.0>
- ProxySet balancer://foo4 lbmethod=heartbeat
- </IfVersion>
-
- <Location /baltest1>
- ProxyPass balancer://foo1/
- </Location>
-
- <Location /baltest2>
- ProxyPass balancer://foo2/
+ ProxySet balancer://foo4 lbmethod=heartbeat
+ <Location /baltest4>
+ # TODO heartbeat needs additional configuration to have it work
+ ProxyPass balancer://foo4/
</Location>
-
- <Location /baltest3>
- ProxyPass balancer://foo3/
- </Location>
-
- <IfVersion >= 2.3.0>
- <Location /baltest4>
- # TODO heartbeat needs additional configuration to have it work
- ProxyPass balancer://foo4/
- </Location>
- </IfVersion>
+ </IfModule>
## PR 45434 tests
<Proxy balancer://pr45434>
Modified: httpd/test/framework/trunk/t/modules/proxy_balancer.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/proxy_balancer.t?rev=1852131&r1=1852130&r2=1852131&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/proxy_balancer.t (original)
+++ httpd/test/framework/trunk/t/modules/proxy_balancer.t Fri Jan 25 13:52:36 2019
@@ -11,17 +11,32 @@ plan tests => 3, need 'proxy_balancer',
Apache::TestRequest::module("proxy_http_balancer");
Apache::TestRequest::user_agent(requests_redirectable => 0);
+my $r;
-my $r = GET("/baltest1/index.html");
-ok t_cmp($r->code, 200, "Balancer did not die");
+if (have_module('lbmethod_byrequests')) {
+ $r = GET("/baltest1/index.html");
+ ok t_cmp($r->code, 200, "Balancer did not die");
+} else {
+ skip "skipping tests without mod_lbmethod_byrequests" foreach (1..1);
+}
-$r = GET("/baltest2/index.html");
-ok t_cmp($r->code, 200, "Balancer did not die");
+if (have_module('lbmethod_bytraffic')) {
+ $r = GET("/baltest2/index.html");
+ ok t_cmp($r->code, 200, "Balancer did not die");
+} else {
+ skip "skipping tests without mod_lbmethod_bytraffic" foreach (1..1);
+}
-$r = GET("/baltest3/index.html");
-ok t_cmp($r->code, 200, "Balancer did not die");
+if (have_module('lbmethod_bybusyness')) {
+ $r = GET("/baltest3/index.html");
+ ok t_cmp($r->code, 200, "Balancer did not die");
+} else {
+ skip "skipping tests without mod_lbmethod_bybusyness" foreach (1..1);
+}
-if (have_min_apache_version("2.3.0")) {
- # $r = GET("/baltest4/index.html");
- # ok t_cmp($r->code, 200, "Balancer did not die");
+if (have_module('lbmethod_heartbeat')) {
+ #$r = GET("/baltest4/index.html");
+ #ok t_cmp($r->code, 200, "Balancer did not die");
+} else {
+ #skip "skipping tests without mod_lbmethod_heartbeat" foreach (1..1);
}