From d43d1897692a2fd363187229b04f2f46cac5e6fd Mon Sep 17 00:00:00 2001 From: CurtizJ Date: Tue, 14 Jan 2020 16:57:40 +0300 Subject: [PATCH] more convinient local testing --- dbms/tests/clickhouse-test | 6 +++++- ...1002_alter_nullable_adaptive_granularity_long.reference} | 0 ...sh => 01002_alter_nullable_adaptive_granularity_long.sh} | 0 ...34_prewhere_max_parallel_replicas_distributed.reference} | 0 ...=> 01034_prewhere_max_parallel_replicas_distributed.sql} | 0 ...l.reference => 01034_sample_final_distributed.reference} | 0 ..._sample_final.sql => 01034_sample_final_distributed.sql} | 0 ...0_dictionary_invalidate_query_switchover_long.reference} | 0 ...=> 01040_dictionary_invalidate_query_switchover_long.sh} | 0 ...ence => 01046_trivial_count_query_distributed.reference} | 0 ..._query.sql => 01046_trivial_count_query_distributed.sql} | 0 11 files changed, 5 insertions(+), 1 deletion(-) rename dbms/tests/queries/0_stateless/{01002_alter_nullable_adaptive_granularity.reference => 01002_alter_nullable_adaptive_granularity_long.reference} (100%) rename dbms/tests/queries/0_stateless/{01002_alter_nullable_adaptive_granularity.sh => 01002_alter_nullable_adaptive_granularity_long.sh} (100%) rename dbms/tests/queries/0_stateless/{01034_prewhere_max_parallel_replicas.reference => 01034_prewhere_max_parallel_replicas_distributed.reference} (100%) rename dbms/tests/queries/0_stateless/{01034_prewhere_max_parallel_replicas.sql => 01034_prewhere_max_parallel_replicas_distributed.sql} (100%) rename dbms/tests/queries/0_stateless/{01034_sample_final.reference => 01034_sample_final_distributed.reference} (100%) rename dbms/tests/queries/0_stateless/{01034_sample_final.sql => 01034_sample_final_distributed.sql} (100%) rename dbms/tests/queries/0_stateless/{01040_dictionary_invalidate_query_switchover.reference => 01040_dictionary_invalidate_query_switchover_long.reference} (100%) rename dbms/tests/queries/0_stateless/{01040_dictionary_invalidate_query_switchover.sh => 01040_dictionary_invalidate_query_switchover_long.sh} (100%) rename dbms/tests/queries/0_stateless/{01046_trivial_count_query.reference => 01046_trivial_count_query_distributed.reference} (100%) rename dbms/tests/queries/0_stateless/{01046_trivial_count_query.sql => 01046_trivial_count_query_distributed.sql} (100%) diff --git a/dbms/tests/clickhouse-test b/dbms/tests/clickhouse-test index 6f34f9d4f03..a216db2d633 100755 --- a/dbms/tests/clickhouse-test +++ b/dbms/tests/clickhouse-test @@ -182,7 +182,11 @@ def run_tests_array(all_tests_with_params): or 'global' in name): print(MSG_SKIPPED + " - no shard") skipped_total += 1 - elif not args.no_long and 'long' in name: + elif not args.no_long and ('long' in name + # Tests for races and deadlocks usually are runned in loop + # for significant amount of time + or 'deadlock' in name + or 'race' in name): print(MSG_SKIPPED + " - no long") skipped_total += 1 else: diff --git a/dbms/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity.reference b/dbms/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.reference similarity index 100% rename from dbms/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity.reference rename to dbms/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.reference diff --git a/dbms/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity.sh b/dbms/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh similarity index 100% rename from dbms/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity.sh rename to dbms/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh diff --git a/dbms/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas.reference b/dbms/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.reference similarity index 100% rename from dbms/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas.reference rename to dbms/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.reference diff --git a/dbms/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas.sql b/dbms/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql similarity index 100% rename from dbms/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas.sql rename to dbms/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql diff --git a/dbms/tests/queries/0_stateless/01034_sample_final.reference b/dbms/tests/queries/0_stateless/01034_sample_final_distributed.reference similarity index 100% rename from dbms/tests/queries/0_stateless/01034_sample_final.reference rename to dbms/tests/queries/0_stateless/01034_sample_final_distributed.reference diff --git a/dbms/tests/queries/0_stateless/01034_sample_final.sql b/dbms/tests/queries/0_stateless/01034_sample_final_distributed.sql similarity index 100% rename from dbms/tests/queries/0_stateless/01034_sample_final.sql rename to dbms/tests/queries/0_stateless/01034_sample_final_distributed.sql diff --git a/dbms/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover.reference b/dbms/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.reference similarity index 100% rename from dbms/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover.reference rename to dbms/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.reference diff --git a/dbms/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover.sh b/dbms/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh similarity index 100% rename from dbms/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover.sh rename to dbms/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh diff --git a/dbms/tests/queries/0_stateless/01046_trivial_count_query.reference b/dbms/tests/queries/0_stateless/01046_trivial_count_query_distributed.reference similarity index 100% rename from dbms/tests/queries/0_stateless/01046_trivial_count_query.reference rename to dbms/tests/queries/0_stateless/01046_trivial_count_query_distributed.reference diff --git a/dbms/tests/queries/0_stateless/01046_trivial_count_query.sql b/dbms/tests/queries/0_stateless/01046_trivial_count_query_distributed.sql similarity index 100% rename from dbms/tests/queries/0_stateless/01046_trivial_count_query.sql rename to dbms/tests/queries/0_stateless/01046_trivial_count_query_distributed.sql