updated xfails

This commit is contained in:
zvonand 2021-07-10 19:56:36 +03:00
parent 75270b8a60
commit 9ce1b349b1
6 changed files with 20 additions and 1 deletions

View File

@ -0,0 +1,6 @@
<?xml version='1.0' encoding='utf8'?>
<yandex>
<kerberos>
<realm>EXAMPLE.COM</realm>
</kerberos>
</yandex>

View File

@ -44,6 +44,11 @@ def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
Feature(run=load("kerberos.tests.config", "config"), flags=TE) Feature(run=load("kerberos.tests.config", "config"), flags=TE)
Feature(run=load("kerberos.tests.parallel", "parallel"), flags=TE) Feature(run=load("kerberos.tests.parallel", "parallel"), flags=TE)
# Feature(run=load("kerberos.tests.generic", "generic"), flags=TE)
# Feature(run=load("kerberos.tests.config", "config"), flags=TE)
# Feature(run=load("kerberos.tests.parallel", "parallel"), flags=TE)
if main(): if main():
regression() regression()

View File

@ -184,11 +184,13 @@ def check_wrong_config(self, node, client, config_path, modify_file, log_error="
with When("I restart ClickHouse to apply the config changes"): with When("I restart ClickHouse to apply the config changes"):
node.cmd("kdestroy") node.cmd("kdestroy")
# time.sleep(1)
if output: if output:
node.restart(safe=False, wait_healthy=True) node.restart(safe=False, wait_healthy=True)
else: else:
node.restart(safe=False, wait_healthy=False) node.restart(safe=False, wait_healthy=False)
if output != "": if output != "":
with Then(f"check {output} is in output"): with Then(f"check {output} is in output"):
time.sleep(5) time.sleep(5)

View File

@ -146,6 +146,7 @@ def multiple_principal(self):
@TestFeature @TestFeature
@Name("config")
def config(self): def config(self):
"""Perform ClickHouse Kerberos authentication testing for incorrect configuration files """Perform ClickHouse Kerberos authentication testing for incorrect configuration files
""" """

View File

@ -343,4 +343,4 @@ def generic(self):
self.context.clients = [self.context.cluster.node(f"krb-client{i}") for i in range(1, 6)] self.context.clients = [self.context.cluster.node(f"krb-client{i}") for i in range(1, 6)]
for scenario in loads(current_module(), Scenario, Suite): for scenario in loads(current_module(), Scenario, Suite):
Scenario(run=scenario, flags=TE, setup=instrument_clickhouse_server_log) Scenario(run=scenario, flags=TE) #, setup=instrument_clickhouse_server_log)

View File

@ -7,9 +7,14 @@ append_path(sys.path, ".")
from helpers.common import Pool, join, run_scenario from helpers.common import Pool, join, run_scenario
from helpers.argparser import argparser from helpers.argparser import argparser
xfails = {
"kerberos/config/principal and realm specified/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/26197")],
}
@TestModule @TestModule
@Name("clickhouse") @Name("clickhouse")
@ArgumentParser(argparser) @ArgumentParser(argparser)
@XFails(xfails)
def regression(self, local, clickhouse_binary_path, stress=None, parallel=None): def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
"""ClickHouse regression. """ClickHouse regression.
""" """