diff --git a/tests/testflows/kerberos/configs/clickhouse3/config.d/kerberos.xml b/tests/testflows/kerberos/configs/clickhouse3/config.d/kerberos.xml new file mode 100644 index 00000000000..e45c4519c73 --- /dev/null +++ b/tests/testflows/kerberos/configs/clickhouse3/config.d/kerberos.xml @@ -0,0 +1,6 @@ + + + + EXAMPLE.COM + + diff --git a/tests/testflows/kerberos/regression.py b/tests/testflows/kerberos/regression.py index ffff136eff2..47f0c8bbe6c 100755 --- a/tests/testflows/kerberos/regression.py +++ b/tests/testflows/kerberos/regression.py @@ -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.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(): regression() diff --git a/tests/testflows/kerberos/tests/common.py b/tests/testflows/kerberos/tests/common.py index 0366cbc237f..8b72f1c2ffd 100644 --- a/tests/testflows/kerberos/tests/common.py +++ b/tests/testflows/kerberos/tests/common.py @@ -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"): node.cmd("kdestroy") + # time.sleep(1) if output: node.restart(safe=False, wait_healthy=True) else: node.restart(safe=False, wait_healthy=False) + if output != "": with Then(f"check {output} is in output"): time.sleep(5) diff --git a/tests/testflows/kerberos/tests/config.py b/tests/testflows/kerberos/tests/config.py index 559be815fcf..85af0b3214e 100644 --- a/tests/testflows/kerberos/tests/config.py +++ b/tests/testflows/kerberos/tests/config.py @@ -146,6 +146,7 @@ def multiple_principal(self): @TestFeature +@Name("config") def config(self): """Perform ClickHouse Kerberos authentication testing for incorrect configuration files """ diff --git a/tests/testflows/kerberos/tests/generic.py b/tests/testflows/kerberos/tests/generic.py index ed3a9a65385..642b99b4fc3 100644 --- a/tests/testflows/kerberos/tests/generic.py +++ b/tests/testflows/kerberos/tests/generic.py @@ -343,4 +343,4 @@ def generic(self): 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): - Scenario(run=scenario, flags=TE, setup=instrument_clickhouse_server_log) + Scenario(run=scenario, flags=TE) #, setup=instrument_clickhouse_server_log) diff --git a/tests/testflows/regression.py b/tests/testflows/regression.py index cc9fa8f4506..fe47edcfca6 100755 --- a/tests/testflows/regression.py +++ b/tests/testflows/regression.py @@ -7,9 +7,14 @@ append_path(sys.path, ".") from helpers.common import Pool, join, run_scenario from helpers.argparser import argparser +xfails = { + "kerberos/config/principal and realm specified/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/26197")], +} + @TestModule @Name("clickhouse") @ArgumentParser(argparser) +@XFails(xfails) def regression(self, local, clickhouse_binary_path, stress=None, parallel=None): """ClickHouse regression. """