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

Fix failing tests when server runs on a different machine

Browse Source
This commit is contained in:
Georg Richter
2024-06-10 13:19:49 +02:00
parent 5efe1e61e2
commit f97bb2e92e
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
unittest/libmariadb/async.c
View File

@@ -156,6 +156,7 @@ static int async1(MYSQL *unused __attribute__((unused)))
mysql_options(&mysql, MYSQL_OPT_CONNECT_TIMEOUT, &default_timeout); mysql_options(&mysql, MYSQL_OPT_CONNECT_TIMEOUT, &default_timeout);
mysql_options(&mysql, MYSQL_OPT_WRITE_TIMEOUT, &default_timeout); mysql_options(&mysql, MYSQL_OPT_WRITE_TIMEOUT, &default_timeout);
mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, "myapp"); mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, "myapp");
mysql_options(&mysql, MARIADB_OPT_SSL_FP, fingerprint);
if (force_tls) if (force_tls)
mysql_ssl_set(&mysql, NULL, NULL, NULL, NULL,NULL); mysql_ssl_set(&mysql, NULL, NULL, NULL, NULL,NULL);

2
unittest/libmariadb/conc336.c
View File

@@ -6,6 +6,7 @@ int main(int argc, char *argv[]) {
MYSQL *mysql; MYSQL *mysql;
int i; int i;
my_bool verify=0;
if (argc > 1) if (argc > 1)
get_options(argc, argv); get_options(argc, argv);
@@ -38,6 +39,7 @@ int main(int argc, char *argv[]) {
if (force_tls) if (force_tls)
mysql_options(mysql, MYSQL_OPT_SSL_ENFORCE, &force_tls); mysql_options(mysql, MYSQL_OPT_SSL_ENFORCE, &force_tls);
mysql_optionsv(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &verify);
if (!mysql_real_connect(mysql, hostname, username, password, schema, port, socketname, 0)) { if (!mysql_real_connect(mysql, hostname, username, password, schema, port, socketname, 0)) {
diag("mysql_real_connect failed: %s", mysql_error(mysql)); diag("mysql_real_connect failed: %s", mysql_error(mysql));

18
unittest/libmariadb/connection.c
View File

@@ -2008,10 +2008,11 @@ static int test_conn_str(MYSQL *my __attribute__((unused)))
char conn_str[1024]; char conn_str[1024];
int rc=OK; int rc=OK;
snprintf(conn_str, sizeof(conn_str)-1, "host=%s;user=%s;password={%s};port=%d;socket=%s", snprintf(conn_str, sizeof(conn_str)-1, "host=%s;user=%s;password={%s};port=%d;socket=%s;tls_fp=%s",
hostname ? hostname : "localhost", username ? username : "", hostname ? hostname : "localhost", username ? username : "",
password ? password : "", password ? password : "",
port, socketname ? socketname : ""); port, socketname ? socketname : "",
fingerprint[0] ? fingerprint : "");
/* SkySQL requires secure connection */ /* SkySQL requires secure connection */
if (IS_SKYSQL(hostname)) if (IS_SKYSQL(hostname))
@@ -2083,9 +2084,9 @@ static int test_conc365(MYSQL *my __attribute__((unused)))
char tmp[1024]; char tmp[1024];
snprintf(tmp, sizeof(tmp) - 1, snprintf(tmp, sizeof(tmp) - 1,
"host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s", "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s;tls_fp=%s",
hostname ? hostname : "localhost", username ? username : "", password ? password : "", hostname ? hostname : "localhost", username ? username : "", password ? password : "",
port, socketname ? socketname : ""); port, socketname ? socketname : "", fingerprint[0] ? fingerprint : "");
if (IS_SKYSQL(hostname)) if (IS_SKYSQL(hostname))
strcat(tmp, ";ssl_enforce=1"); strcat(tmp, ";ssl_enforce=1");
@@ -2131,6 +2132,7 @@ static int test_conc365_reconnect(MYSQL *my)
MYSQL *mysql= mysql_init(NULL); MYSQL *mysql= mysql_init(NULL);
char tmp[1024]; char tmp[1024];
my_bool reconnect= 1; my_bool reconnect= 1;
SKIP_MAXSCALE; SKIP_MAXSCALE;
mysql_options(mysql, MYSQL_OPT_RECONNECT, &reconnect); mysql_options(mysql, MYSQL_OPT_RECONNECT, &reconnect);
@@ -2138,14 +2140,14 @@ static int test_conc365_reconnect(MYSQL *my)
if (IS_SKYSQL(hostname)) if (IS_SKYSQL(hostname))
{ {
snprintf(tmp, sizeof(tmp) - 1, snprintf(tmp, sizeof(tmp) - 1,
"host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s;ssl_enforce=1", "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s;ssl_enforce=1;tls_fp=%s",
hostname ? hostname : "localhost", username ? username : "", password ? password : "", hostname ? hostname : "localhost", username ? username : "", password ? password : "",
ssl_port, socketname ? socketname : ""); ssl_port, socketname ? socketname : "", fingerprint[0] ? fingerprint : "");
} else { } else {
snprintf(tmp, sizeof(tmp) - 1, snprintf(tmp, sizeof(tmp) - 1,
"host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s", "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s;tls_fp=%s",
hostname ? hostname : "localhost", username ? username : "", password ? password : "", hostname ? hostname : "localhost", username ? username : "", password ? password : "",
port, socketname ? socketname : ""); port, socketname ? socketname : "", fingerprint[0] ? fingerprint :"");
} }
if (!my_test_connect(mysql, tmp, username, if (!my_test_connect(mysql, tmp, username,

1
unittest/libmariadb/misc.c
View File

@@ -1638,6 +1638,7 @@ static int test_disable_tls1_0(MYSQL *my __attribute__((unused)))
mysql_ssl_set(mysql, NULL, NULL, NULL, NULL, NULL); mysql_ssl_set(mysql, NULL, NULL, NULL, NULL, NULL);
mysql_optionsv(mysql, MARIADB_OPT_TLS_VERSION, disabled_version); mysql_optionsv(mysql, MARIADB_OPT_TLS_VERSION, disabled_version);
mysql_optionsv(mysql, MARIADB_OPT_SSL_FP, fingerprint);
FAIL_IF(!mysql_real_connect(mysql, hostname, username, password, schema, FAIL_IF(!mysql_real_connect(mysql, hostname, username, password, schema,
port, socketname, 0), mysql_error(mysql)); port, socketname, 0), mysql_error(mysql));

2
unittest/libmariadb/my_test.h
View File

@@ -224,7 +224,7 @@ MYSQL *my_test_connect(MYSQL *mysql,
static const char *schema = 0; static const char *schema = 0;
static char *hostname = 0; static char *hostname = 0;
static char *password = 0; static char *password = 0;
static char fingerprint[65]; static char fingerprint[65]= {0};
static unsigned int port = 0; static unsigned int port = 0;
static unsigned int ssl_port = 0; static unsigned int ssl_port = 0;
static char *socketname = 0; static char *socketname = 0;