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

Update server test suite

Browse Source
This commit is contained in:
rusher
2023-08-30 09:52:22 +02:00
parent 209b23a38c
commit dd927bd171
4 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@@ -46,7 +46,8 @@ jobs:
- env: srv=skysql - env: srv=skysql
- env: srv=skysql-ha - env: srv=skysql-ha
- env: srv=xpand - env: srv=xpand
- env: srv=mysql - env: srv=mysql v=5.7
- env: srv=mysql v=8.0
include: include:
- stage: Minimal - stage: Minimal
env: srv=mariadb v=10.6 packet=8 env: srv=mariadb v=10.6 packet=8
@@ -68,8 +69,6 @@ jobs:
name: "ES 23.08" name: "ES 23.08"
- env: srv=maxscale - env: srv=maxscale
name: "Maxscale" name: "Maxscale"
- env: srv=xpand TEST_DB_OTHER="&initSql=SET NAMES UTF8"
name: "Xpand"
- env: srv=skysql - env: srv=skysql
name: "SkySQL" name: "SkySQL"
- env: srv=skysql-ha - env: srv=skysql-ha
@@ -97,7 +96,7 @@ jobs:
name: "CS 10.11 with ps-protocol" name: "CS 10.11 with ps-protocol"
- env: srv=mariadb v=11.0 local=1 - env: srv=mariadb v=11.0 local=1
name: "CS 11.0" name: "CS 11.0"
- env: srv=mariadb v=11.1-rc local=1 - env: srv=mariadb v=11.1 local=1
name: "CS 11.1" name: "CS 11.1"
- env: srv=mysql v=5.7 native=1 - env: srv=mysql v=5.7 native=1
name: "MySQL 5.7" name: "MySQL 5.7"

4
travis.sh
View File

@@ -93,8 +93,8 @@ else
fi fi
export MYSQL_TEST_TLS=$TEST_REQUIRE_TLS export MYSQL_TEST_TLS=$TEST_REQUIRE_TLS
export SSLCERT=$TEST_DB_SERVER_CERT export SSLCERT=$TEST_DB_SERVER_CERT
if [ -n "$MYSQL_TEST_SSL_PORT" ] ; then if [ -n "$TEST_MAXSCALE_TLS_PORT" ] ; then
export MYSQL_TEST_SSL_PORT=$MYSQL_TEST_SSL_PORT export MYSQL_TEST_SSL_PORT=$TEST_MAXSCALE_TLS_PORT
fi fi
make make
fi fi

28
unittest/libmariadb/connection.c
View File

@@ -2041,13 +2041,7 @@ static int test_conn_str_1(MYSQL *my __attribute__((unused)))
sprintf(conn_str, "connection=host=%s;user=%s;password=%s;port=%d;ssl_enforce=1;socket=%s", sprintf(conn_str, "connection=host=%s;user=%s;password=%s;port=%d;ssl_enforce=1;socket=%s",
hostname ? hostname : "localhost", username ? username : "", hostname ? hostname : "localhost", username ? username : "",
password ? password : "", port, socketname ? socketname : ""); password ? password : "", ssl_port, socketname ? socketname : "");
/* SkySQL requires secure connection */
if (IS_SKYSQL(hostname))
{
strcat(conn_str, ";ssl_enforce=1");
}
fprintf(fp, "[client]\n"); fprintf(fp, "[client]\n");
fprintf(fp, "%s\n", conn_str); fprintf(fp, "%s\n", conn_str);
@@ -2132,16 +2126,22 @@ 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;
mysql_options(mysql, MYSQL_OPT_RECONNECT, &reconnect); mysql_options(mysql, MYSQL_OPT_RECONNECT, &reconnect);
snprintf(tmp, sizeof(tmp) - 1, if (IS_SKYSQL(hostname))
"host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s", {
hostname ? hostname : "localhost", username ? username : "", password ? password : "", snprintf(tmp, sizeof(tmp) - 1,
port, socketname ? socketname : ""); "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s;ssl_enforce=1",
hostname ? hostname : "localhost", username ? username : "", password ? password : "",
if (IS_SKYSQL(hostname)) ssl_port, socketname ? socketname : "");
strcat(tmp, ";ssl_enforce=1"); } else {
snprintf(tmp, sizeof(tmp) - 1,
"host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s",
hostname ? hostname : "localhost", username ? username : "", password ? password : "",
port, socketname ? socketname : "");
}
if (!my_test_connect(mysql, tmp, username, if (!my_test_connect(mysql, tmp, username,
password, schema, port, socketname, CLIENT_REMEMBER_OPTIONS)) password, schema, port, socketname, CLIENT_REMEMBER_OPTIONS))

2
unittest/libmariadb/my_test.h
View File

@@ -57,7 +57,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
# define TRUE 1 # define TRUE 1
#endif #endif
#define IS_SKYSQL(a) ((a) && strstr((a), "db.skysql.net")) #define IS_SKYSQL(a) ((a) && strstr((a), "skysql.mariadb.com"))
#define SKIP_SKYSQL \ #define SKIP_SKYSQL \
if (IS_SKYSQL(hostname)) \ if (IS_SKYSQL(hostname)) \
{ \ { \