mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 00:30:49 +00:00
run tests with Ordinary database in flaky check
This commit is contained in:
parent
465cc7807a
commit
06e42a1b23
@ -84,13 +84,9 @@ function run_tests()
|
||||
# more idiologically correct.
|
||||
read -ra ADDITIONAL_OPTIONS <<< "${ADDITIONAL_OPTIONS:-}"
|
||||
|
||||
# Skip these tests, because they fail when we rerun them multiple times
|
||||
# Use random order in flaky check
|
||||
if [ "$NUM_TRIES" -gt "1" ]; then
|
||||
ADDITIONAL_OPTIONS+=('--order=random')
|
||||
ADDITIONAL_OPTIONS+=('--skip')
|
||||
ADDITIONAL_OPTIONS+=('00000_no_tests_to_skip')
|
||||
# Note that flaky check must be ran in parallel, but for now we run
|
||||
# everything in parallel except DatabaseReplicated. See below.
|
||||
fi
|
||||
|
||||
if [[ -n "$USE_S3_STORAGE_FOR_MERGE_TREE" ]] && [[ "$USE_S3_STORAGE_FOR_MERGE_TREE" -eq 1 ]]; then
|
||||
@ -129,6 +125,13 @@ function run_tests()
|
||||
|
||||
export -f run_tests
|
||||
|
||||
if [ "$NUM_TRIES" -gt "1" ]; then
|
||||
# We don't run tests with Ordinary database in PRs, only in master.
|
||||
# So run new/changed tests with Ordinary at least once in flaky check.
|
||||
timeout "$MAX_RUN_TIME" bash -c 'NUM_TRIES=1; USE_DATABASE_ORDINARY=1; run_tests' \
|
||||
| sed 's/All tests have finished//' | sed 's/No tests were run//' ||:
|
||||
fi
|
||||
|
||||
timeout "$MAX_RUN_TIME" bash -c run_tests ||:
|
||||
|
||||
echo "Files in current directory"
|
||||
|
@ -61,7 +61,6 @@ function thread6()
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
|
||||
export -f thread1;
|
||||
export -f thread2;
|
||||
|
@ -6,6 +6,7 @@ create view v (n Nullable(Int32), f Float64) as select n, f from t;
|
||||
create materialized view mv engine=Null as select * from system.one;
|
||||
create temporary table tmp (d Date, dt DateTime, dtms DateTime64(3));
|
||||
|
||||
|
||||
-- FIXME #28687
|
||||
select * from information_schema.schemata where schema_name ilike 'information_schema';
|
||||
-- SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE (TABLE_SCHEMA=currentDatabase() OR TABLE_SCHEMA='') AND TABLE_NAME NOT LIKE '%inner%';
|
||||
|
@ -1,5 +1,6 @@
|
||||
-- Tags: no-s3-storage, no-ordinary-database
|
||||
-- FIXME this test fails with S3 due to a bug in DiskCacheWrapper
|
||||
|
||||
drop table if exists txn_counters;
|
||||
|
||||
create table txn_counters (n Int64, creation_tid DEFAULT transactionID()) engine=MergeTree order by n;
|
||||
|
Loading…
Reference in New Issue
Block a user