generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-09 11:17:31 +01:00
Code Issues Projects Releases Wiki Activity

force mysql tcp connection; fix failing tests

Browse Source
This commit is contained in:
Alex Fabijanic 2017-07-06 19:11:23 +02:00
parent 035177e1d2
commit c271e49247
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Data/MySQL/testsuite/run-tests.sh
View File

@ -12,6 +12,7 @@ docker run -p 3306:3306 --name poco-test-mysql -e MYSQL_ROOT_PASSWORD=poco -e MY
echo "poco-test-mysql container up and running, sleeping $MYSQL_DB_START_WAIT seconds waiting for db to start ..." echo "poco-test-mysql container up and running, sleeping $MYSQL_DB_START_WAIT seconds waiting for db to start ..."
sleep $MYSQL_DB_START_WAIT sleep $MYSQL_DB_START_WAIT
echo "running tests ..."
./bin/Linux/x86_64/testrunner -all ./bin/Linux/x86_64/testrunner -all
echo "stopping poco-test-mysql docker container" echo "stopping poco-test-mysql docker container"

17
Data/MySQL/testsuite/src/MySQLTest.cpp
View File

@ -116,7 +116,7 @@ void MySQLTest::connectNoDB()
dbConnString = "host=" + getHost(); dbConnString = "host=" + getHost();
dbConnString += ";user=" + getUser(); dbConnString += ";user=" + getUser();
dbConnString += ";password=" + getPass(); dbConnString += ";password=" + getPass();
dbConnString += ";compress=true;auto-reconnect=true"; dbConnString += ";compress=true;auto-reconnect=true;protocol=tcp";
try try
{ {
@ -208,7 +208,7 @@ void MySQLTest::testInsertSingleBulk()
{ {
if (!_pSession) fail ("Test not available."); if (!_pSession) fail ("Test not available.");
recreateIntsTable(); recreateStringsTable();
_pExecutor->insertSingleBulk(); _pExecutor->insertSingleBulk();
} }
@ -217,7 +217,7 @@ void MySQLTest::testInsertSingleBulkVec()
{ {
if (!_pSession) fail ("Test not available."); if (!_pSession) fail ("Test not available.");
recreateIntsTable(); recreateStringsTable();
_pExecutor->insertSingleBulkVec(); _pExecutor->insertSingleBulkVec();
} }
@ -226,7 +226,7 @@ void MySQLTest::testLimit()
{ {
if (!_pSession) fail ("Test not available."); if (!_pSession) fail ("Test not available.");
recreateIntsTable(); recreateStringsTable();
_pExecutor->limits(); _pExecutor->limits();
} }
@ -235,7 +235,7 @@ void MySQLTest::testLimitZero()
{ {
if (!_pSession) fail ("Test not available."); if (!_pSession) fail ("Test not available.");
recreateIntsTable(); recreateStringsTable();
_pExecutor->limitZero(); _pExecutor->limitZero();
} }
@ -244,7 +244,7 @@ void MySQLTest::testLimitOnce()
{ {
if (!_pSession) fail ("Test not available."); if (!_pSession) fail ("Test not available.");
recreateIntsTable(); recreateStringsTable();
_pExecutor->limitOnce(); _pExecutor->limitOnce();
} }
@ -253,7 +253,7 @@ void MySQLTest::testLimitPrepare()
{ {
if (!_pSession) fail ("Test not available."); if (!_pSession) fail ("Test not available.");
recreateIntsTable(); recreateStringsTable();
_pExecutor->limitPrepare(); _pExecutor->limitPrepare();
} }
@ -263,7 +263,7 @@ void MySQLTest::testPrepare()
{ {
if (!_pSession) fail ("Test not available."); if (!_pSession) fail ("Test not available.");
recreateIntsTable(); recreateStringsTable();
_pExecutor->prepare(); _pExecutor->prepare();
} }
@ -908,6 +908,7 @@ CppUnit::Test* MySQLTest::suite()
_dbConnString += ";compress=true"; _dbConnString += ";compress=true";
_dbConnString += ";auto-reconnect=true"; _dbConnString += ";auto-reconnect=true";
_dbConnString += ";secure-auth=true"; _dbConnString += ";secure-auth=true";
_dbConnString += ";protocol=tcp";
try try
{ {