thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-28 02:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Use new possibly redefined values from env (in 2 tests)

Browse Source
This commit is contained in:
proller 2017-10-12 22:54:56 +03:00
parent f8548156a0
commit 26c44d5993
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dbms/tests/queries/0_stateless/00501_http_head.sh
View File

@ -1,10 +1,11 @@
#!/usr/bin/env bash #!/usr/bin/env bash
CLICKHOUSE_URL=${CLICKHOUSE_URL:=http://localhost:8123/} CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
. $CURDIR/../shell_config.sh
( curl -s --head "${CLICKHOUSE_URL}?query=SELECT%201"; ( ${CLICKHOUSE_CURL} -s --head "${CLICKHOUSE_URL}?query=SELECT%201";
curl -s --head "${CLICKHOUSE_URL}?query=select+*+from+system.numbers+limit+1000000" ) | grep -v "Date:" ${CLICKHOUSE_CURL} -s --head "${CLICKHOUSE_URL}?query=select+*+from+system.numbers+limit+1000000" ) | grep -v "Date:"
if [[ `curl -sS -X POST -I "${CLICKHOUSE_URL}?query=SELECT+1" | grep -c '411 Length Required'` -ne 1 ]]; then if [[ `${CLICKHOUSE_CURL} -sS -X POST -I "${CLICKHOUSE_URL}?query=SELECT+1" | grep -c '411 Length Required'` -ne 1 ]]; then
echo FAIL echo FAIL
fi fi

12
dbms/tests/queries/0_stateless/00505_tcp_ssl.sh
View File

@ -2,13 +2,15 @@
# Not default server config needed # Not default server config needed
tcp_ssl_port=`clickhouse extract-from-config -c /etc/clickhouse-server/config.xml -k tcp_ssl_port 2>/dev/null` CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
. $CURDIR/../shell_config.sh
tcp_ssl_port=`${CLICKHOUSE_EXTRACT_CONFIG} -k tcp_ssl_port 2>/dev/null`
if [ -z ${tcp_ssl_port} ]; then if [ -z ${tcp_ssl_port} ]; then
# Secure port disabled. Fake result # Secure port disabled. Fake result
echo 1 cat $CURDIR/00505_tcp_ssl.reference
echo 2
else else
# Auto port detect # Auto port detect
clickhouse-client --ssl -q "SELECT 1"; ${CLICKHOUSE_CLIENT} --ssl -q "SELECT 1";
clickhouse-client --ssl --port=9440 -q "SELECT 2"; ${CLICKHOUSE_CLIENT} --ssl --port=9440 -q "SELECT 2";
fi fi