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

MXS-3249 Fix mysqltest tests

Browse Source 
To avouid failures caused by default MariaDB configuration files
containing entries incompatible with mysqltest, mysqltest is
invoked with the glah --no-defaults, which will cause it *not* to
read any configuration files.
This commit is contained in:
Johan Wikman
2020-10-27 13:57:34 +02:00
parent aa5a63be14
commit e522bce80f
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
system-test/cache_basic.sh
View File

@ -18,7 +18,8 @@ function run_test
echo $test_name echo $test_name
logdir=log_$test_name logdir=log_$test_name
mkdir -p $logdir mkdir -p $logdir
mysqltest --host=${maxscale_000_network} --port=$port \ mysqltest --no-defaults \
--host=${maxscale_000_network} --port=$port \
--user=$user --password=$password \ --user=$user --password=$password \
--logdir=$logdir \ --logdir=$logdir \
--test-file=$dir/t/$test_name.test \ --test-file=$dir/t/$test_name.test \

6
system-test/masking_user.sh
View File

@ -34,7 +34,8 @@ dir="$src_dir/masking/$1"
user=skysql user=skysql
test_name=masking_user test_name=masking_user
mysqltest --host=${maxscale_000_network} --port=$port \ mysqltest --no-defaults \
--host=${maxscale_000_network} --port=$port \
--user=$maxscale_user --password=$maxscale_password \ --user=$maxscale_user --password=$maxscale_password \
--logdir=$logdir \ --logdir=$logdir \
--test-file=$dir/t/$test_name.test \ --test-file=$dir/t/$test_name.test \
@ -50,7 +51,8 @@ fi
user=maxskysql user=maxskysql
test_name=masking_user test_name=masking_user
mysqltest --host=${maxscale_000_network} --port=$port \ mysqltest --no-defaults \
--host=${maxscale_000_network} --port=$port \
--user=$maxscale_user --password=$maxscale_password \ --user=$maxscale_user --password=$maxscale_password \
--logdir=$logdir \ --logdir=$logdir \
--test-file=$dir/t/$test_name.test \ --test-file=$dir/t/$test_name.test \

3
system-test/mysqltest_driver.sh
View File

@ -47,7 +47,8 @@ for t in `ls $2/t/*.test|xargs -L 1 basename`
do do
printf "$t:" printf "$t:"
test_name=${t%%.test} test_name=${t%%.test}
mysqltest --host=${maxscale_000_network} --port=$port \ mysqltest --no-defaults \
--host=${maxscale_000_network} --port=$port \
--user=$user --password=$password \ --user=$user --password=$password \
--logdir=log_$1 \ --logdir=log_$1 \
--test-file=$2/t/$test_name.test \ --test-file=$2/t/$test_name.test \