thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-18 04:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16365 from vzakaznikov/fix_another_ldap_test_issue

Browse Source 
Fixing another issue in LDAP tests
This commit is contained in:
alexey-milovidov 2020-10-26 07:38:20 +03:00 committed by GitHub
commit e30e4a47fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/testflows/ldap/authentication/tests/common.py
View File

@ -85,19 +85,29 @@ def add_config(config, timeout=60, restart=False):
:param config: configuration file description :param config: configuration file description
:param timeout: timeout, default: 20 sec :param timeout: timeout, default: 20 sec
""" """
def check_preprocessed_config_is_updated(): def check_preprocessed_config_is_updated(after_removal=False):
"""Check that preprocessed config is updated. """Check that preprocessed config is updated.
""" """
started = time.time() started = time.time()
command = f"cat /var/lib/clickhouse/preprocessed_configs/{config.preprocessed_name} | grep {config.uid}{' > /dev/null' if not settings.debug else ''}" command = f"cat /var/lib/clickhouse/preprocessed_configs/{config.preprocessed_name} | grep {config.uid}{' > /dev/null' if not settings.debug else ''}"
while time.time() - started < timeout: while time.time() - started < timeout:
exitcode = node.command(command, steps=False).exitcode exitcode = node.command(command, steps=False).exitcode
if exitcode == 0: if after_removal:
break if exitcode == 1:
break
else:
if exitcode == 0:
break
time.sleep(1) time.sleep(1)
if settings.debug: if settings.debug:
node.command(f"cat /var/lib/clickhouse/preprocessed_configs/{config.preprocessed_name}") node.command(f"cat /var/lib/clickhouse/preprocessed_configs/{config.preprocessed_name}")
assert exitcode == 0, error()
if after_removal:
assert exitcode == 1, error()
else:
assert exitcode == 0, error()
def wait_for_config_to_be_loaded(): def wait_for_config_to_be_loaded():
"""Wait for config to be loaded. """Wait for config to be loaded.
@ -160,7 +170,7 @@ def add_config(config, timeout=60, restart=False):
node.command(f"rm -rf {config.path}", exitcode=0) node.command(f"rm -rf {config.path}", exitcode=0)
with Then(f"{config.preprocessed_name} should be updated", description=f"timeout {timeout}"): with Then(f"{config.preprocessed_name} should be updated", description=f"timeout {timeout}"):
check_preprocessed_config_is_updated() check_preprocessed_config_is_updated(after_removal=True)
with And("I wait for config to be reloaded"): with And("I wait for config to be reloaded"):
wait_for_config_to_be_loaded() wait_for_config_to_be_loaded()