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

Fix failing tests

Browse Source 
Changed mxs1719 to expect a failure with the query and added monitor waits
to mxs359_read_only.
This commit is contained in:
Markus Mäkelä
2018-07-06 17:14:22 +03:00
parent 40d076b4ce
commit 8470da9313
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
maxscale-system-test/mxs1719.cpp
View File

@ -42,8 +42,10 @@ void run(TestConnections& test)
if (mysql_real_connect(pMysql, test.maxscales->IP[0], zUser, zPassword, "test", port, NULL,
CLIENT_MULTI_STATEMENTS))
{
// One multi-statement with two UPDATEs.
test.try_query(pMysql, "UPDATE MXS_1719 SET a=1; UPDATE MXS_1719 SET a=1;");
const char* q = "UPDATE MXS_1719 SET a=1; UPDATE MXS_1719 SET a=1;";
// One multi-statement with two UPDATEs. Note: This query should fail
// with 2.3 now that function blocking has been added
test.assert(execute_query_silent(pMysql, q) != 0, "Query '%s' should not succeed", q);
// Sleep a while, so that the log is flushed.
sleep(5);
@ -54,6 +56,7 @@ void run(TestConnections& test)
// This will hang immediately, so we can shorten the timeout.
test.set_timeout(5);
test.try_query(pMysql, "SELECT * FROM MXS_1719");
test.stop_timeout();
}
else
{