rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

Accepting request 811671 from home:pgajdos:python

Browse Source 
- rpm macros: $TEST_USER identified by $TEST_PASS is actually user
  of the database for which client conf should be made for
- rpm macros: database name or names can be specified as a
  %mysql_testserver_start and %mysql_testserver_cconf parameter
- modified sources
  % macros.mariadb-test

OBS-URL: https://build.opensuse.org/request/show/811671
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=255
This commit is contained in:
Martin Pluskal 2020-06-06 05:40:58 +00:00 committed by Git OBS Bridge
parent dc3fde076f
commit f45ebb26ad
2 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
macros.mariadb-test
View File

@ -3,14 +3,19 @@
%__mysql_test_pass dbuserpass %__mysql_test_pass dbuserpass
%__mysql_test_cconf abuild-myclient.cnf %__mysql_test_cconf abuild-myclient.cnf
%__mysql_test_port 63306 %__mysql_test_port 63306
%__mysql_test_db testdb
# #
# macro: mysql_testserver_start -- start a test mysqld instance # macro: mysql_testserver_start -- start a test mysqld instance
# #
# usage: %mysql_test_start -u <dbuser> -p <dbpassword> -t <port> # usage: %mysql_test_start -u <db_user> -p <db_user_password> -t <port> -d <db_names>
#
# db_user: user of the database (not admin of the server)
# db_user_password: his password
# db_names: name or names separated by semicolon (e. g. testhat or test1:test2)
# #
%mysql_testserver_start(u:p:t:) \ %mysql_testserver_start(u:p:t:d:) \
TEST_RUN_DIR=%{__mysql_test_run_dir} \ TEST_RUN_DIR=%{__mysql_test_run_dir} \
TEST_USER="%{-u:%{-u*}}" \ TEST_USER="%{-u:%{-u*}}" \
if [ -z "$TEST_USER" ]; then \ if [ -z "$TEST_USER" ]; then \
@ -24,6 +29,10 @@ TEST_PORT="%{-t:%{-t*}}" \
if [ -z "$TEST_PORT" ]; then \ if [ -z "$TEST_PORT" ]; then \
TEST_PORT='%{__mysql_test_port}' \ TEST_PORT='%{__mysql_test_port}' \
fi \ fi \
TEST_DB="%{-d:%{-d*}}" \
if [ -z "$TEST_DB" ]; then \
TEST_DB='%{__mysql_test_db}' \
fi \
\ \
[ -d $TEST_RUN_DIR ] && rm -r $TEST_RUN_DIR \ [ -d $TEST_RUN_DIR ] && rm -r $TEST_RUN_DIR \
mkdir -p $TEST_RUN_DIR/datadir{,-private} \ mkdir -p $TEST_RUN_DIR/datadir{,-private} \
@ -50,9 +59,11 @@ echo '>>> Invoking mysqld' \
/usr/sbin/mysqld --defaults-file=$TEST_RUN_DIR/my.cnf& \ /usr/sbin/mysqld --defaults-file=$TEST_RUN_DIR/my.cnf& \
sleep 2 \ sleep 2 \
\ \
echo '>>> Creating authentication database (credentials: $TEST_USER, $TEST_PASS)' \ echo ">>> Creating \'$TEST_DB\' database, (credentials: $TEST_USER, $TEST_PASS)" \
mysqladmin --defaults-file=$TEST_RUN_DIR/my.cnf --user=abuild password abuildpw \ mysqladmin --defaults-file=$TEST_RUN_DIR/my.cnf --user=abuild password abuildpw \
mysqladmin --defaults-file=$TEST_RUN_DIR/my.cnf --user=abuild --password=abuildpw create testhat \ for db in `echo $TEST_DB | tr ':' ' '`; do \
mysqladmin --defaults-file=$TEST_RUN_DIR/my.cnf --user=abuild --password=abuildpw create $db \
done \
cat << EOF > $TEST_RUN_DIR/create_auth.sql \ cat << EOF > $TEST_RUN_DIR/create_auth.sql \
CREATE USER '$TEST_USER'@'localhost' IDENTIFIED BY '$TEST_PASS'; \ CREATE USER '$TEST_USER'@'localhost' IDENTIFIED BY '$TEST_PASS'; \
GRANT ALL PRIVILEGES ON * . * TO '$TEST_USER'@'localhost'; \ GRANT ALL PRIVILEGES ON * . * TO '$TEST_USER'@'localhost'; \
@ -62,24 +73,28 @@ mysql --defaults-file=$TEST_RUN_DIR/my.cnf --user=abuild --password=abuild
%nil %nil
# #
# macro mysql_testserver_cconf -- generate client access conf # macro: mysql_testserver_cconf -- generate client access conf
# #
# usage: %mysql_testserver_cconf -n <filename> -d <dbname>
#
# filename: filename of the configuration
# dbname: database name (only one, not multiple as in %mysql_testserver_start)
%mysql_testserver_cconf(n:t:) \ %mysql_testserver_cconf(n:d:) \
TEST_RUN_DIR=%{__mysql_test_run_dir} \ TEST_RUN_DIR=%{__mysql_test_run_dir} \
TEST_CCONF="%{-n:%{-n*}}" \ TEST_CCONF="%{-n:%{-n*}}" \
if [ -z "$TEST_CCONF" ]; then \ if [ -z "$TEST_CCONF" ]; then \
TEST_CCONF='%{__mysql_test_cconf}' \ TEST_CCONF='%{__mysql_test_cconf}' \
fi \ fi \
TEST_PORT="%{-t:%{-t*}}" \ TEST_DB="%{-d:%{-d*}}" \
if [ -z "$TEST_PORT" ]; then \ if [ -z "$TEST_DB" ]; then \
TEST_PORT='%{__mysql_test_port}' \ TEST_DB='%{__mysql_test_db}' \
fi \ fi \
cat << EOF > $TEST_CCONF \ cat << EOF > $TEST_CCONF \
[client] \ [client] \
user = abuild \ user = $TEST_USER \
password = abuildpw \ password = $TEST_PASS \
database = test \ database = $TEST_DB \
socket = $TEST_RUN_DIR/mysql.sock \ socket = $TEST_RUN_DIR/mysql.sock \
port = $TEST_PORT \ port = $TEST_PORT \
EOF\ EOF\

10
mariadb.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Jun 3 13:32:46 UTC 2020 - pgajdos@suse.com
- rpm macros: $TEST_USER identified by $TEST_PASS is actually user
of the database for which client conf should be made for
- rpm macros: database name or names can be specified as a
%mysql_testserver_start and %mysql_testserver_cconf parameter
- modified sources
% macros.mariadb-test
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 1 11:50:50 UTC 2020 - Kristyna Streitova <kstreitova@suse.com> Mon Jun 1 11:50:50 UTC 2020 - Kristyna Streitova <kstreitova@suse.com>