clickhouse-test: Implement @@SKIP@@ directive in tests

This commit is contained in:
Raúl Marín 2021-08-11 15:20:36 +02:00
parent 2d4030f98b
commit 4ebdb5917a
3 changed files with 19 additions and 1 deletions

View File

@ -650,6 +650,10 @@ def run_tests_array(all_tests_with_params):
status += " - having exception in stdout:\n{}\n".format(
'\n'.join(stdout.split('\n')[:100]))
status += 'Database: ' + testcase_args.testcase_database
elif '@@SKIP@@' in stdout:
skipped_total += 1
skip_reason = stdout.replace('@@SKIP@@', '').rstrip("\n")
status += MSG_SKIPPED + f" - {skip_reason}\n"
elif reference_file is None:
status += MSG_UNKNOWN
status += print_test_time(total_time)

View File

@ -6,10 +6,15 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
# If we run sanitized binary under qemu, it will try to slowly allocate 20 TiB until OOM.
# Don't even try to do that. This test should be disabled for sanitizer builds.
${CLICKHOUSE_LOCAL} --query "SELECT max(value LIKE '%sanitize%') FROM system.build_options" | grep -q '1' && echo 'Skip test for sanitizer build' && exit
${CLICKHOUSE_LOCAL} --query "SELECT max(value LIKE '%sanitize%') FROM system.build_options" | grep -q '1' && echo '@@SKIP@@: Sanitizer build' && exit
command=$(command -v ${CLICKHOUSE_LOCAL})
if ! hash qemu-x86_64-static 2>/dev/null; then
echo "@@SKIP@@: No qemu-x86_64-static"
exit 0
fi
function run_with_cpu()
{
qemu-x86_64-static -cpu "$@" "$command" --query "SELECT 1" 2>&1 | grep -v -F "warning: TCG doesn't support requested feature" ||:

View File

@ -7,6 +7,15 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
# shellcheck source=../shell_config.sh
. "$CUR_DIR"/../shell_config.sh
if [[ -z $S3_ACCESS_KEY_ID ]]; then
echo "@@SKIP@@: Missing \$S3_ACCESS_KEY_ID"
exit 0
fi
if [[ -z $S3_SECRET_ACCESS ]]; then
echo "@@SKIP@@: Missing \$S3_SECRET_ACCESS"
exit 0
fi
${CLICKHOUSE_CLIENT_BINARY} --send_logs_level="none" -q "SELECT * FROM s3('https://s3.mds.yandex.net/clickhouse-test-reports/*/*/functional_stateless_tests_(ubsan)/test_results.tsv', '$S3_ACCESS_KEY_ID', '$S3_SECRET_ACCESS', 'LineAsString', 'line String') limit 100 FORMAT Null;"
${CLICKHOUSE_CLIENT_BINARY} --send_logs_level="none" -q "SELECT * FROM s3Cluster('test_cluster_two_shards', 'https://s3.mds.yandex.net/clickhouse-test-reports/*/*/functional_stateless_tests_(ubsan)/test_results.tsv', '$S3_ACCESS_KEY_ID', '$S3_SECRET_ACCESS', 'LineAsString', 'line String') limit 100 FORMAT Null;"