mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-27 18:12:02 +00:00
Merge pull request #51914 from ClickHouse/fix-flaky-test-02360_send_logs_level_colors
Fix flaky test 02360_send_logs_level_colors: avoid usage of `file` tool
This commit is contained in:
commit
ca455b62fb
@ -1,11 +1,12 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
|
CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
|
||||||
|
CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=trace
|
||||||
|
|
||||||
# shellcheck source=../shell_config.sh
|
# shellcheck source=../shell_config.sh
|
||||||
. "$CURDIR"/../shell_config.sh
|
. "$CURDIR"/../shell_config.sh
|
||||||
|
|
||||||
file_name="${CLICKHOUSE_TMP}/res_${CLICKHOUSE_DATABASE}.log"
|
file_name="${CLICKHOUSE_TMP}/res_${CLICKHOUSE_DATABASE}.log"
|
||||||
CLICKHOUSE_CLIENT=$(echo ${CLICKHOUSE_CLIENT} | sed 's/'"--send_logs_level=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL}"'/--send_logs_level=trace/g')
|
|
||||||
|
|
||||||
# Run query via expect to make isatty() return true
|
# Run query via expect to make isatty() return true
|
||||||
function run()
|
function run()
|
||||||
@ -20,8 +21,7 @@ spawn bash -c "$command"
|
|||||||
expect 1
|
expect 1
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
file "$file_name" | grep -o "ASCII text"
|
grep -F $'\x1b' "$file_name" && cat "$file_name" || echo "ASCII text"
|
||||||
file "$file_name" | grep -o "with escape sequences"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
run "$CLICKHOUSE_CLIENT -q 'SELECT 1' 2>$file_name"
|
run "$CLICKHOUSE_CLIENT -q 'SELECT 1' 2>$file_name"
|
||||||
|
Loading…
Reference in New Issue
Block a user