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

Backport testing fixes to 2.1

Browse Source 
Some of the testing fixes weren't included into 2.1 and due to that, a few
of the tests appear to fail.
This commit is contained in:
Markus Mäkelä
2017-07-27 08:28:16 +03:00
parent e26ec4f8b9
commit 563fdb4db5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxscale-system-test/mariadb_tests_hartmut.sh
View File

@ -4,7 +4,7 @@
# #
# TODO: Don't test correctness of routing with mysqltest # TODO: Don't test correctness of routing with mysqltest
# #
./non_native_setup $1
master_id=`echo "SELECT @@server_id" | mysql -u$node_user -p$node_password -h $node_000_network $ssl_options -P $node_000_port | tail -n1` master_id=`echo "SELECT @@server_id" | mysql -u$node_user -p$node_password -h $node_000_network $ssl_options -P $node_000_port | tail -n1`
echo "--disable_query_log" > Hartmut_tests/maxscale-mysqltest/testconf.inc echo "--disable_query_log" > Hartmut_tests/maxscale-mysqltest/testconf.inc
echo "SET @TMASTER_ID=$master_id;" >> Hartmut_tests/maxscale-mysqltest/testconf.inc echo "SET @TMASTER_ID=$master_id;" >> Hartmut_tests/maxscale-mysqltest/testconf.inc

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

@ -1672,7 +1672,7 @@ void *timeout_thread( void *ptr )
Test->timeout--; Test->timeout--;
} }
Test->tprintf("\n **** Timeout! *** \n"); Test->tprintf("\n **** Timeout! *** \n");
delete Test; Test->~TestConnections();
exit(250); exit(250);
} }