mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-22 19:43:51 -05:00
Code Issues Packages Projects Releases 156 Wiki Activity

Allow specifying user in start_sql_server() bats helper function.

Browse Source
This commit is contained in:
Nick Tobey
2023-05-31 14:13:35 -07:00
parent 346b6a89e0
commit d5f9564895
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/bats/helper/local-remote.bash
+6 -7
View File
@@ -1,22 +1,21 @@
SKIP_SERVER_TESTS=(
)
load helper/query-server-common
setup_remote_server() {
script_name = $(basename $BASH_SOURCE)
if [ "$START_SQL_SERVER" = $true ];
script_name=$(basename $BASH_SOURCE)
if [ "$START_SQL_SERVER" = "true" ];
then
if [ echo "$SKIP_SERVER_TESTS" | grep "$script_name" ];
if [[ "$SKIP_SERVER_TESTS" =~ "$script_name" ]];
then
skip
else
USER=root
start_sql_server
fi
fi
}
teardown_remote_server() {
if [ "$START_SQL_SERVER" = $true ];
if [ "$START_SQL_SERVER" = "true" ];
then
stop_sql_server
fi
integration-tests/bats/helper/query-server-common.bash
+5 -5
View File
@@ -21,12 +21,12 @@ import os
import sys
args = sys.argv[sys.argv.index('--') + 1:]
working_dir, database, port_str, timeout_ms = args
working_dir, database, port_str, timeout_ms, user = args
os.chdir(working_dir)
from pytest import wait_for_connection
wait_for_connection(port=int(port_str), timeout_ms=int(timeout_ms), database=database, user='dolt')
" -- "$PYTEST_DIR" "$DEFAULT_DB" "$1" "$2"
wait_for_connection(port=int(port_str), timeout_ms=int(timeout_ms), database=database, user=user)
" -- "$PYTEST_DIR" "$DEFAULT_DB" "$1" "$2" "${USER:-dolt}"
}
start_sql_server() {
@@ -35,9 +35,9 @@ start_sql_server() {
PORT=$( definePORT )
if [[ $logFile ]]
then
dolt sql-server --host 0.0.0.0 --port=$PORT --user dolt --socket "dolt.$PORT.sock" > $logFile 2>&1 &
dolt sql-server --host 0.0.0.0 --port=$PORT --user "${USER:-dolt}" --socket "dolt.$PORT.sock" > $logFile 2>&1 &
else
dolt sql-server --host 0.0.0.0 --port=$PORT --user dolt --socket "dolt.$PORT.sock" &
dolt sql-server --host 0.0.0.0 --port=$PORT --user "${USER:-dolt}" --socket "dolt.$PORT.sock" &
fi
SERVER_PID=$!
wait_for_connection $PORT 5000