Skip to content

[Tests] Fix a bad shell execution and a bad variable override #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhusar merged 3 commits into from
Apr 20, 2026
Merged

[Tests] Fix a bad shell execution and a bad variable override #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a733b56
test: Fix bad shell invocation
jajik Apr 16, 2026
872a227
test: Fix wrong overriding of a provided MPC_CONF variable
jajik Apr 16, 2026
a5d386f
test: Remove UseAlias with mod_proxy_balancer
jajik Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/includes/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ tomcat_wait_for_n_nodes() {
echo "$(date) httpd isn't running or something VERY wrong"
exit 1
fi
echo "($date) Waiting for $nodes nodes DONE"
echo "$(date) Waiting for $nodes nodes DONE"
}

#
Expand Down
2 changes: 0 additions & 2 deletions test/testsuite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ res=$(expr $res + $?)

MPC_CONF=httpd/mod_lbmethod_cluster.conf run_test basetests.sh "Basic tests with mod_proxy_balancer"
res=$(expr $res + $?)
MPC_CONF=usealias/mod_lbmethod_cluster.conf run_test usealias/testit.sh "UseAlias with mod_proxy_balancer"
res=$(expr $res + $?)
MPC_CONF=MODCLUSTER-640/mod_lbmethod_cluster.conf run_test MODCLUSTER-640/testit.sh "MODCLUSTER-640 with mod_proxy_balancer"
res=$(expr $res + $?)
MPC_CONF=MODCLUSTER-734/mod_lbmethod_cluster.conf run_test MODCLUSTER-734/testit.sh "MODCLUSTER-734 with mod_proxy_balancer"
Expand Down
2 changes: 1 addition & 1 deletion test/usealias/testit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ httpd_remove
tomcat_all_remove

# Make sure to use custom conf with UseAlias On
MPC_CONF=usealias/mod_proxy_cluster.conf httpd_start
MPC_CONF=${MPC_CONF:-usealias/mod_proxy_cluster.conf} httpd_start


tomcat_start 1
Expand Down
2 changes: 1 addition & 1 deletion test/websocket/basic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ httpd_remove
tomcat_all_remove

# run a fresh httpd
MPC_CONF=websocket/mod_proxy_cluster.conf httpd_start
MPC_CONF=${MPC_CONF:-websocket/mod_proxy_cluster.conf} httpd_start

tomcat_start_two || exit 1
tomcat_wait_for_n_nodes 2 || exit 1
Expand Down