database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

Travis fixes:

Browse Source 
- run reconnect test without server certificate verification
- moved conc336 to manual tests (should run with valgrind).
This commit is contained in:
Georg Richter
2025-01-15 13:16:32 +01:00
parent d2a5bfcdd3
commit 362be9e919
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unittest/libmariadb/CMakeLists.txt
View File

@@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/include
ADD_DEFINITIONS(-DLIBMARIADB) ADD_DEFINITIONS(-DLIBMARIADB)
SET(API_TESTS "conc336" "bulk1" "performance" "basic-t" "fetch" "charset" "logs" "cursor" "errors" "view" "ps" "ps_bugs" "sp" "result" "connection" "misc" "ps_new" "thread" "features-10_2") SET(API_TESTS "bulk1" "performance" "basic-t" "fetch" "charset" "logs" "cursor" "errors" "view" "ps" "ps_bugs" "sp" "result" "connection" "misc" "ps_new" "thread" "features-10_2")
IF(WITH_DYNCOL) IF(WITH_DYNCOL)
SET(API_TESTS ${API_TESTS} "dyncol") SET(API_TESTS ${API_TESTS} "dyncol")
ENDIF() ENDIF()
@@ -45,7 +45,7 @@ IF(NOT WIN32)
ENDIF() ENDIF()
#exclude following tests from ctests, since we need to run them manually with different credentials #exclude following tests from ctests, since we need to run them manually with different credentials
SET(MANUAL_TESTS "t_conc173" "rpl_api") SET(MANUAL_TESTS "t_conc173" "rpl_api" "conc336")
# Get finger print from server certificate # Get finger print from server certificate
IF(WITH_SSL) IF(WITH_SSL)
IF(CERT_PATH AND NOT DEFINED ENV{TRAVIS}) IF(CERT_PATH AND NOT DEFINED ENV{TRAVIS})

2
unittest/libmariadb/connection.c
View File

@@ -2456,8 +2456,10 @@ static int test_conc589(MYSQL *my)
MYSQL_RES *result; MYSQL_RES *result;
int rc; int rc;
my_bool reconnect= 1; my_bool reconnect= 1;
my_bool no= 0;
unsigned long last_thread_id= 0; unsigned long last_thread_id= 0;
mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &no);
mysql_options(mysql, MYSQL_OPT_RECONNECT, &reconnect); mysql_options(mysql, MYSQL_OPT_RECONNECT, &reconnect);
if (!my_test_connect(mysql, hostname, username, if (!my_test_connect(mysql, hostname, username,