updated xfails

tests/testflows/kerberos/configs/clickhouse3/config.d/kerberos.xml

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

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()

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)

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
     """

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)

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.
     """