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

Fix test failures

Browse Source 
Replaced sleep in bug676 with wait_for_monitor, removed unsupported
commands from maxinfo_sql.
This commit is contained in:
Markus Mäkelä
2018-06-12 21:56:46 +03:00
parent 61cc709519
commit 17535acfc3
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxscale-system-test/bug676.cpp
View File

@ -26,7 +26,7 @@ int main(int argc, char *argv[])
test.stop_timeout(); test.stop_timeout();
test.tprintf("Waiting until the monitor picks a new master"); test.tprintf("Waiting until the monitor picks a new master");
sleep(5); test.maxscales->wait_for_monitor();
test.set_timeout(30); test.set_timeout(30);

2
maxscale-system-test/maxinfo_sql.cpp
View File

@ -14,8 +14,6 @@ int main(int argc, char** argv)
{ {
vector<string> commands( vector<string> commands(
{ {
"SET SERVER server1 master",
"CLEAR SERVER server1 master",
"FLUSH LOGS", "FLUSH LOGS",
"SHOW VARIABLES", "SHOW VARIABLES",
"SHOW VARIABLES LIKE '%version%'", "SHOW VARIABLES LIKE '%version%'",