thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 00:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix test

Browse Source
This commit is contained in:
Alexander Tokmakov 2021-06-23 12:28:18 +03:00
parent 7b5f34cb55
commit ee5b0c2c34
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/queries/0_stateless/00505_secure.reference
View File

@ -1,4 +1,3 @@
1
2 2
3 3
4 4

15
tests/queries/0_stateless/00505_secure.sh
View File

@ -6,21 +6,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
# shellcheck source=../shell_config.sh # shellcheck source=../shell_config.sh
. "$CURDIR"/../shell_config.sh . "$CURDIR"/../shell_config.sh
# Not default server config needed
if [ -n "$CLICKHOUSE_CONFIG_CLIENT" ]; then
USE_CONFIG="--config-file $CLICKHOUSE_CONFIG_CLIENT"
fi
CLICKHOUSE_CLIENT_SECURE=${CLICKHOUSE_CLIENT_SECURE:="$CLICKHOUSE_CLIENT_BINARY $USE_CONFIG --secure --port=$CLICKHOUSE_PORT_TCP_SECURE"}
if [[ $CLICKHOUSE_CLIENT != *"--port"* ]]; then
# Auto port detect. Cant test with re-defined via command line ports
$CLICKHOUSE_CLIENT_BINARY $USE_CONFIG --secure -q "SELECT 1";
else
echo 1
fi
$CLICKHOUSE_CLIENT_SECURE -q "SELECT 2;" $CLICKHOUSE_CLIENT_SECURE -q "SELECT 2;"
#disable test #disable test

2
tests/queries/shell_config.sh
View File

@ -73,6 +73,8 @@ export CLICKHOUSE_PORT_MYSQL=${CLICKHOUSE_PORT_MYSQL:="9004"}
export CLICKHOUSE_PORT_POSTGRESQL=${CLICKHOUSE_PORT_POSTGRESQL:=$(${CLICKHOUSE_EXTRACT_CONFIG} --try --key=postgresql_port 2>/dev/null)} 2>/dev/null export CLICKHOUSE_PORT_POSTGRESQL=${CLICKHOUSE_PORT_POSTGRESQL:=$(${CLICKHOUSE_EXTRACT_CONFIG} --try --key=postgresql_port 2>/dev/null)} 2>/dev/null
export CLICKHOUSE_PORT_POSTGRESQL=${CLICKHOUSE_PORT_POSTGRESQL:="9005"} export CLICKHOUSE_PORT_POSTGRESQL=${CLICKHOUSE_PORT_POSTGRESQL:="9005"}
CLICKHOUSE_CLIENT_SECURE=$(echo ${CLICKHOUSE_CLIENT} | sed 's/'"--port=${CLICKHOUSE_PORT_TCP}"'/'"--secure --port=${CLICKHOUSE_PORT_TCP_SECURE}"'/g')
# Add database and log comment to url params # Add database and log comment to url params
if [ -v CLICKHOUSE_URL_PARAMS ] if [ -v CLICKHOUSE_URL_PARAMS ]
then then