Merge pull request #25374 from vzakaznikov/enable_ldap_tests_and_increase_verification_cooldown_perforamnce_timeout

TestFlows: increase LDAP verification cooldown performance tests timeout to 600 sec
This commit is contained in:
alexey-milovidov 2021-06-17 09:09:58 +03:00 committed by GitHub
commit 0972b53ef4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -661,7 +661,7 @@ def valid_verification_cooldown_value_ldap_unavailable(self, server, rbac=False)
delete_user_from_ldap(user, exitcode=None)
@TestOutline
def repeat_requests(self, server, iterations, vcd_value, rbac=False):
def repeat_requests(self, server, iterations, vcd_value, rbac=False, timeout=600):
"""Run repeated requests from some user to the LDAP server.
"""
@ -688,7 +688,7 @@ def repeat_requests(self, server, iterations, vcd_value, rbac=False):
with ldap_authenticated_users({"username": user["cn"], "server": server}, config_file=f"ldap_users_{getuid()}.xml"):
with When(f"I login and execute some query {iterations} times"):
start_time = time.time()
r = self.context.node.command(f"time for i in {{1..{iterations}}}; do clickhouse client -q \"SELECT 1\" --user {user['cn']} --password {user['userpassword']} > /dev/null; done")
r = self.context.node.command(f"time for i in {{1..{iterations}}}; do clickhouse client -q \"SELECT 1\" --user {user['cn']} --password {user['userpassword']} > /dev/null; done", timeout=timeout)
end_time = time.time()
return end_time - start_time

View File

@ -23,7 +23,7 @@ def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
with Pool(8) as pool:
try:
run_scenario(pool, tasks, Feature(test=load("example.regression", "regression")), args)
#run_scenario(pool, tasks, Feature(test=load("ldap.regression", "regression")), args)
run_scenario(pool, tasks, Feature(test=load("ldap.regression", "regression")), args)
#run_scenario(pool, tasks, Feature(test=load("rbac.regression", "regression")), args)
run_scenario(pool, tasks, Feature(test=load("aes_encryption.regression", "regression")), args)
run_scenario(pool, tasks, Feature(test=load("map_type.regression", "regression")), args)