thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better timeouts in clickhouse-test

Browse Source
This commit is contained in:
alesapin 2021-10-11 14:46:01 +03:00
parent 95a69b9f4b
commit 59a78830f9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/clickhouse-test
View File

@ -89,10 +89,13 @@ def make_clickhouse_client(base_args):
# hence we should use 'system'.
database='system',
settings=get_additional_client_options_dict(base_args))
def clickhouse_execute_one(base_args, *args, **kwargs):
return make_clickhouse_client(base_args).execute_one(*args, **kwargs)
def clickhouse_execute(base_args, *args, **kwargs):
return make_clickhouse_client(base_args).execute(*args, **kwargs)
def clickhouse_execute_pandas(base_args, *args, **kwargs):
return make_clickhouse_client(base_args).execute_pandas(*args, **kwargs)
@ -109,6 +112,7 @@ def stop_tests():
global restarted_tests
with stop_tests_triggered_lock:
print("Stopping tests")
if not stop_tests_triggered.is_set():
stop_tests_triggered.set()
@ -875,7 +879,7 @@ def run_tests_array(all_tests_with_params):
while True:
if is_concurrent:
case = queue.get()
case = queue.get(timeout=args.timeout)
if not case:
break
else:
@ -1076,10 +1080,10 @@ def do_run_tests(jobs, test_suite: TestSuite, parallel):
pool.map_async(run_tests_array, parallel_tests_array)
for suit in test_suite.parallel_tests:
queue.put(suit)
queue.put(suit, timeout=args.timeout)
for _ in range(jobs):
queue.put(None)
queue.put(None, timeout=args.timeout)
queue.close()