thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Yatsishin Ilya 2021-05-14 19:38:40 +03:00
parent aa4c91a2b3
commit cfb55c2cf6
3 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/integration/ci-runner.py
View File

@ -371,8 +371,9 @@ class ClickhouseIntegrationTestsRunner:
test_names.add(test_name) test_names.add(test_name)
test_cmd = ' '.join([test for test in sorted(test_names)]) test_cmd = ' '.join([test for test in sorted(test_names)])
cmd = "cd {}/tests/integration && ./runner {} --tmpfs -t {} --parallel {} '-ss -rfEp --color=no --durations=0 {}' | tee {}".format( parallel_cmd = " --parallel {} ".format(num_workers) if num_workers > 0 else ""
repo_path, image_cmd, test_cmd, num_workers, _get_deselect_option(self.should_skip_tests()), output_path) cmd = "cd {}/tests/integration && ./runner {} --tmpfs -t {} {} '-ss -rfEp --color=no --durations=0 {}' | tee {}".format(
repo_path, image_cmd, test_cmd, parallel_cmd, _get_deselect_option(self.should_skip_tests()), output_path)
with open(log_path, 'w') as log: with open(log_path, 'w') as log:
logging.info("Executing cmd: %s", cmd) logging.info("Executing cmd: %s", cmd)

25
tests/integration/parallel.json
View File

@ -25,10 +25,6 @@
"test_backup_restore/test.py::test_attach_partition", "test_backup_restore/test.py::test_attach_partition",
"test_backup_restore/test.py::test_replace_partition", "test_backup_restore/test.py::test_replace_partition",
"test_backup_restore/test.py::test_restore", "test_backup_restore/test.py::test_restore",
"test_backup_with_other_granularity/test.py::test_backup_and_alter",
"test_backup_with_other_granularity/test.py::test_backup_from_old_version",
"test_backup_with_other_granularity/test.py::test_backup_from_old_version_config",
"test_backup_with_other_granularity/test.py::test_backup_from_old_version_setting",
"test_backward_compatibility/test_aggregate_function_state_avg.py::test_backward_compatability", "test_backward_compatibility/test_aggregate_function_state_avg.py::test_backward_compatability",
"test_backward_compatibility/test.py::test_backward_compatability1", "test_backward_compatibility/test.py::test_backward_compatability1",
"test_backward_compatibility/test_short_strings_aggregation.py::test_backward_compatability", "test_backward_compatibility/test_short_strings_aggregation.py::test_backward_compatability",
@ -440,7 +436,6 @@
"test_drop_replica/test.py::test_drop_replica", "test_drop_replica/test.py::test_drop_replica",
"test_enabling_access_management/test.py::test_enabling_access_management", "test_enabling_access_management/test.py::test_enabling_access_management",
"test_extreme_deduplication/test.py::test_deduplication_window_in_seconds", "test_extreme_deduplication/test.py::test_deduplication_window_in_seconds",
"test_extreme_deduplication/test.py::test_deduplication_works_in_case_of_intensive_inserts SKIPPED",
"test_fetch_partition_from_auxiliary_zookeeper/test.py::test_fetch_part_from_allowed_zookeeper[PART-2020-08-28-20200828_0_0_0]", "test_fetch_partition_from_auxiliary_zookeeper/test.py::test_fetch_part_from_allowed_zookeeper[PART-2020-08-28-20200828_0_0_0]",
"test_fetch_partition_from_auxiliary_zookeeper/test.py::test_fetch_part_from_allowed_zookeeper[PARTITION-2020-08-27-2020-08-27]", "test_fetch_partition_from_auxiliary_zookeeper/test.py::test_fetch_part_from_allowed_zookeeper[PARTITION-2020-08-27-2020-08-27]",
"test_fetch_partition_should_reset_mutation/test.py::test_part_should_reset_mutation", "test_fetch_partition_should_reset_mutation/test.py::test_part_should_reset_mutation",
@ -555,7 +550,6 @@
"test_insert_into_distributed/test.py::test_prefer_localhost_replica", "test_insert_into_distributed/test.py::test_prefer_localhost_replica",
"test_insert_into_distributed/test.py::test_reconnect", "test_insert_into_distributed/test.py::test_reconnect",
"test_insert_into_distributed/test.py::test_table_function", "test_insert_into_distributed/test.py::test_table_function",
"test_insert_into_distributed_through_materialized_view/test.py::test_inserts_batching SKIPPED",
"test_insert_into_distributed_through_materialized_view/test.py::test_inserts_local", "test_insert_into_distributed_through_materialized_view/test.py::test_inserts_local",
"test_insert_into_distributed_through_materialized_view/test.py::test_reconnect", "test_insert_into_distributed_through_materialized_view/test.py::test_reconnect",
"test_jbod_balancer/test.py::test_jbod_balanced_merge", "test_jbod_balancer/test.py::test_jbod_balanced_merge",
@ -839,8 +833,6 @@
"test_polymorphic_parts/test.py::test_in_memory_wal_rotate", "test_polymorphic_parts/test.py::test_in_memory_wal_rotate",
"test_polymorphic_parts/test.py::test_polymorphic_parts_basics[first_node0-second_node0]", "test_polymorphic_parts/test.py::test_polymorphic_parts_basics[first_node0-second_node0]",
"test_polymorphic_parts/test.py::test_polymorphic_parts_basics[first_node1-second_node1]", "test_polymorphic_parts/test.py::test_polymorphic_parts_basics[first_node1-second_node1]",
"test_polymorphic_parts/test.py::test_polymorphic_parts_diff_versions_2 SKIPPED",
"test_polymorphic_parts/test.py::test_polymorphic_parts_diff_versions SKIPPED",
"test_polymorphic_parts/test.py::test_polymorphic_parts_index", "test_polymorphic_parts/test.py::test_polymorphic_parts_index",
"test_polymorphic_parts/test.py::test_polymorphic_parts_non_adaptive", "test_polymorphic_parts/test.py::test_polymorphic_parts_non_adaptive",
"test_postgresql_database_engine/test.py::test_get_create_table_query_with_multidim_arrays", "test_postgresql_database_engine/test.py::test_get_create_table_query_with_multidim_arrays",
@ -1092,7 +1084,6 @@
"test_storage_rabbitmq/test.py::test_rabbitmq_mv_combo", "test_storage_rabbitmq/test.py::test_rabbitmq_mv_combo",
"test_storage_rabbitmq/test.py::test_rabbitmq_no_connection_at_startup", "test_storage_rabbitmq/test.py::test_rabbitmq_no_connection_at_startup",
"test_storage_rabbitmq/test.py::test_rabbitmq_overloaded_insert", "test_storage_rabbitmq/test.py::test_rabbitmq_overloaded_insert",
"test_storage_rabbitmq/test.py::test_rabbitmq_protobuf SKIPPED (clich...)",
"test_storage_rabbitmq/test.py::test_rabbitmq_restore_failed_connection_without_losses_1", "test_storage_rabbitmq/test.py::test_rabbitmq_restore_failed_connection_without_losses_1",
"test_storage_rabbitmq/test.py::test_rabbitmq_restore_failed_connection_without_losses_2", "test_storage_rabbitmq/test.py::test_rabbitmq_restore_failed_connection_without_losses_2",
"test_storage_rabbitmq/test.py::test_rabbitmq_select", "test_storage_rabbitmq/test.py::test_rabbitmq_select",
@ -1175,8 +1166,6 @@
"test_ttl_move/test.py::test_disabled_ttl_move_on_insert[replicated_disk]", "test_ttl_move/test.py::test_disabled_ttl_move_on_insert[replicated_disk]",
"test_ttl_move/test.py::test_disabled_ttl_move_on_insert[replicated_volume]", "test_ttl_move/test.py::test_disabled_ttl_move_on_insert[replicated_volume]",
"test_ttl_move/test.py::test_disabled_ttl_move_on_insert[volume]", "test_ttl_move/test.py::test_disabled_ttl_move_on_insert[volume]",
"test_ttl_move/test.py::test_double_move_while_select[negative] SKIPPED",
"test_ttl_move/test.py::test_double_move_while_select[positive] SKIPPED",
"test_ttl_move/test.py::test_inserts_to_disk_work[mt_test_inserts_to_disk_do_not_work]", "test_ttl_move/test.py::test_inserts_to_disk_work[mt_test_inserts_to_disk_do_not_work]",
"test_ttl_move/test.py::test_inserts_to_disk_work[mt_test_inserts_to_disk_work_1]", "test_ttl_move/test.py::test_inserts_to_disk_work[mt_test_inserts_to_disk_work_1]",
"test_ttl_move/test.py::test_inserts_to_disk_work[replicated_mt_test_inserts_to_disk_do_not_work]", "test_ttl_move/test.py::test_inserts_to_disk_work[replicated_mt_test_inserts_to_disk_do_not_work]",
@ -1220,20 +1209,6 @@
"test_ttl_move/test.py::test_ttls_do_not_work_after_alter[repicated_positive]", "test_ttl_move/test.py::test_ttls_do_not_work_after_alter[repicated_positive]",
"test_ttl_move/test.py::test_ttls_do_not_work_after_alter[replicated_external_negative]", "test_ttl_move/test.py::test_ttls_do_not_work_after_alter[replicated_external_negative]",
"test_ttl_move/test.py::test_ttls_do_not_work_after_alter[replicated_external_positive]", "test_ttl_move/test.py::test_ttls_do_not_work_after_alter[replicated_external_positive]",
"test_ttl_replicated/test.py::test_merge_with_ttl_timeout",
"test_ttl_replicated/test.py::test_modify_column_ttl",
"test_ttl_replicated/test.py::test_modify_ttl",
"test_ttl_replicated/test.py::test_ttl_alter_delete[test_ttl_alter_delete]",
"test_ttl_replicated/test.py::test_ttl_alter_delete[test_ttl_alter_delete_replicated]",
"test_ttl_replicated/test.py::test_ttl_columns",
"test_ttl_replicated/test.py::test_ttl_compatibility[node_left0-node_right0-0]",
"test_ttl_replicated/test.py::test_ttl_compatibility[node_left1-node_right1-1]",
"test_ttl_replicated/test.py::test_ttl_compatibility[node_left2-node_right2-2]",
"test_ttl_replicated/test.py::test_ttl_double_delete_rule_returns_error",
"test_ttl_replicated/test.py::test_ttl_empty_parts",
"test_ttl_replicated/test.py::test_ttl_many_columns",
"test_ttl_replicated/test.py::test_ttl_table[]",
"test_ttl_replicated/test.py::test_ttl_table[DELETE]",
"test_union_header/test.py::test_read", "test_union_header/test.py::test_read",
"test_user_directories/test.py::test_duplicates", "test_user_directories/test.py::test_duplicates",
"test_user_directories/test.py::test_local_directories", "test_user_directories/test.py::test_local_directories",

2
tests/integration/parallel.readme
View File

@ -3,4 +3,4 @@
# 1. Generate all tests list as in CI run # 1. Generate all tests list as in CI run
./runner ' --setup-plan' | grep '::' | sed 's/ (fixtures used:.*//g' | sed 's/^ *//g' | sed 's/ *$//g' | sort -u > all_tests.txt ./runner ' --setup-plan' | grep '::' | sed 's/ (fixtures used:.*//g' | sed 's/^ *//g' | sed 's/ *$//g' | sort -u > all_tests.txt
# 2. Filter known tests that can be run in parallel # 2. Filter known tests that can be run in parallel
cat all_tests.txt | grep -v 'grpc\|test_adaptive_granularity\|test_adaptive_granularity\|test_adaptive_granularity\|kafka' | awk '{$1=$1;print}' | jq -R -n '[inputs] | .' > parallel.json cat all_tests.txt | grep -v 'grpc\|SKIP\|test_backup_with_other_granularity\|test_ttl_replicated\|test_adaptive_granularity\|kafka' | awk '{$1=$1;print}' | jq -R -n '[inputs] | .' > parallel.json