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

Avoid using test.repl->N in MariaDBMonitor tests

Browse Source 
The value may not match the nodes used by the test.
This commit is contained in:
Esa Korhonen
2020-11-24 10:42:52 +02:00
parent abd1efefc6
commit 885077b4d0
11 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp
View File

@ -209,6 +209,7 @@ int main(int argc, char** argv)
int server2_ind = 1;
int server1_id = test.repl->get_server_id(server1_ind);
const int N = 4;
const char* server_names[] = {"server1", "server2", "server3", "server4"};
auto server1_name = server_names[server1_ind];
auto server2_name = server_names[server2_ind];
@ -307,10 +308,10 @@ int main(int argc, char** argv)
if (test.ok())
{
// Check that all other nodes are slaves.
for (int i = 1; i < test.repl->N; i++)
for (int i = 1; i < N; i++)
{
string server_name = server_names[i];
auto states = test.maxscales->get_server_status(server_name.c_str());
states = test.maxscales->get_server_status(server_name.c_str());
test.expect(states.count("Slave") == 1, "%s is not a slave.", server_name.c_str());
}
}