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

tests: catch exceptions in threads in test_distributed_ddl_parallel

Browse Source 
Otherwise the test will not report an error.
This commit is contained in:
Azat Khuzhin 2021-02-22 19:13:09 +03:00
parent b899d8d919
commit 06e8bb955d
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/integration/test_distributed_ddl_parallel/test.py
View File

@ -10,6 +10,25 @@ from helpers.cluster import ClickHouseCluster
cluster = ClickHouseCluster(__file__) cluster = ClickHouseCluster(__file__)
# By default the exceptions that was throwed in threads will be ignored
# (they will not mark the test as failed, only printed to stderr).
#
# Wrap thrading.Thread and re-throw exception on join()
class SafeThread(threading.Thread):
def __init__(self, target):
super().__init__()
self.target = target
self.exception = None
def run(self):
try:
self.target()
except Exception as e: # pylint: disable=broad-except
self.exception = e
def join(self, timeout=None):
super().join(timeout)
if self.exception:
raise self.exception
def add_instance(name): def add_instance(name):
main_configs=[ main_configs=[
'configs/ddl.xml', 'configs/ddl.xml',
@ -68,11 +87,11 @@ def test_all_in_parallel():
def inner_test(): def inner_test():
threads = [] threads = []
for _ in range(2): for _ in range(2):
threads.append(threading.Thread(target=thread_reload_dictionary)) threads.append(SafeThread(target=thread_reload_dictionary))
for thread in threads: for thread in threads:
thread.start() thread.start()
for thread in threads: for thread in threads:
thread.join() thread.join(60)
inner_test() inner_test()
def test_two_in_parallel_two_queued(): def test_two_in_parallel_two_queued():
@ -81,11 +100,11 @@ def test_two_in_parallel_two_queued():
def inner_test(): def inner_test():
threads = [] threads = []
for _ in range(4): for _ in range(4):
threads.append(threading.Thread(target=thread_reload_dictionary)) threads.append(SafeThread(target=thread_reload_dictionary))
for thread in threads: for thread in threads:
thread.start() thread.start()
for thread in threads: for thread in threads:
thread.join() thread.join(60)
inner_test() inner_test()
def test_smoke(): def test_smoke():