hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2167: Change expected test outcome

Browse Source 
The test should now pass as the functionality is implemented. Also added a
temporary workaround to firewall problems.
This commit is contained in:
Markus Mäkelä
2018-11-15 12:52:37 +02:00
parent cbe1483028
commit eac9b86647
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
maxscale-system-test/CMakeLists.txt
View File

@ -199,9 +199,6 @@ add_test_executable(maxctrl_basic.cpp maxctrl_basic replication LABELS maxctrl R
# MXS-2167: Monitors should be able to use extra_port # MXS-2167: Monitors should be able to use extra_port
add_test_executable(mxs2167_extra_port.cpp mxs2167_extra_port mxs2167_extra_port LABELS REPL_BACKEND) add_test_executable(mxs2167_extra_port.cpp mxs2167_extra_port mxs2167_extra_port LABELS REPL_BACKEND)
# TODO: Remove this once MXS-2167 is fixed
set_tests_properties(mxs2167_extra_port PROPERTIES WILL_FAIL TRUE)
############################################ ############################################
# BEGIN: Tests that require GTID # # BEGIN: Tests that require GTID #
############################################ ############################################

5
maxscale-system-test/mxs2167_extra_port.cpp
View File

@ -20,6 +20,11 @@ int main(int argc, char** argv)
// Add the extra_port parameter to all servers // Add the extra_port parameter to all servers
for (int i = 0; i < test.repl->N; i++) for (int i = 0; i < test.repl->N; i++)
{ {
// Temporary workaround for firewall issues
test.repl->ssh_node_f(i, true,
"iptables -I INPUT -p tcp --dport 33066 -j ACCEPT;"
"ip6tables -I INPUT -p tcp --dport 33066 -j ACCEPT");
test.repl->stash_server_settings(i); test.repl->stash_server_settings(i);
test.repl->add_server_setting(i, "extra_port=33066"); test.repl->add_server_setting(i, "extra_port=33066");
test.repl->ssh_node_f(i, true, "service mysql restart"); test.repl->ssh_node_f(i, true, "service mysql restart");