From 6d254aa557041070f3586a316feb2b0117f18a63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20Benjamin=20Antal?=
 <benjamin.antal@clickhouse.com>
Date: Thu, 21 Sep 2023 08:19:09 +0000
Subject: [PATCH] Remove tests

---
 .../test_ssl_cert_authentication/test.py      | 61 ++-----------------
 tests/integration/test_tlsv1_3/test.py        | 61 ++-----------------
 2 files changed, 8 insertions(+), 114 deletions(-)

diff --git a/tests/integration/test_ssl_cert_authentication/test.py b/tests/integration/test_ssl_cert_authentication/test.py
index d31457488c1..a893a502e09 100644
--- a/tests/integration/test_ssl_cert_authentication/test.py
+++ b/tests/integration/test_ssl_cert_authentication/test.py
@@ -206,20 +206,8 @@ def test_https_wrong_cert():
         execute_query_https("SELECT currentUser()", user="john", cert_name="client2")
     assert "403" in str(err.value)
 
-    count = 0
-    # Wrong certificate: self-signed certificate.
-    while count <= MAX_RETRY:
-        with pytest.raises(Exception) as err:
-            execute_query_https("SELECT currentUser()", user="john", cert_name="wrong")
-        err_str = str(err.value)
-        if count < MAX_RETRY and (
-            ("Broken pipe" in err_str) or ("EOF occurred" in err_str)
-        ):
-            count = count + 1
-            logging.warning(f"Failed attempt with wrong cert, err: {err_str}")
-            continue
-        assert "unknown ca" in err_str
-        break
+    # TODO: Add non-flaky tests for:
+    # - Wrong certificate: self-signed certificate.
 
     # No certificate.
     with pytest.raises(Exception) as err:
@@ -309,49 +297,8 @@ def test_https_non_ssl_auth():
         == "jane\n"
     )
 
-    count = 0
-    # However if we send a certificate it must not be wrong.
-    while count <= MAX_RETRY:
-        with pytest.raises(Exception) as err:
-            execute_query_https(
-                "SELECT currentUser()",
-                user="peter",
-                enable_ssl_auth=False,
-                cert_name="wrong",
-            )
-        err_str = str(err.value)
-        if count < MAX_RETRY and (
-            ("Broken pipe" in err_str) or ("EOF occurred" in err_str)
-        ):
-            count = count + 1
-            logging.warning(
-                f"Failed attempt with wrong cert, user: peter, err: {err_str}"
-            )
-            continue
-        assert "unknown ca" in err_str
-        break
-
-    count = 0
-    while count <= MAX_RETRY:
-        with pytest.raises(Exception) as err:
-            execute_query_https(
-                "SELECT currentUser()",
-                user="jane",
-                enable_ssl_auth=False,
-                password="qwe123",
-                cert_name="wrong",
-            )
-        err_str = str(err.value)
-        if count < MAX_RETRY and (
-            ("Broken pipe" in err_str) or ("EOF occurred" in err_str)
-        ):
-            count = count + 1
-            logging.warning(
-                f"Failed attempt with wrong cert, user: jane, err: {err_str}"
-            )
-            continue
-        assert "unknown ca" in err_str
-        break
+    # TODO: Add non-flaky tests for:
+    # - sending wrong cert
 
 
 def test_create_user():
diff --git a/tests/integration/test_tlsv1_3/test.py b/tests/integration/test_tlsv1_3/test.py
index 87c03c56f91..e36989a9cdb 100644
--- a/tests/integration/test_tlsv1_3/test.py
+++ b/tests/integration/test_tlsv1_3/test.py
@@ -90,20 +90,8 @@ def test_https_wrong_cert():
         execute_query_https("SELECT currentUser()", user="john", cert_name="client2")
     assert "HTTP Error 403" in str(err.value)
 
-    count = 0
-    # Wrong certificate: self-signed certificate.
-    while count <= MAX_RETRY:
-        with pytest.raises(Exception) as err:
-            execute_query_https("SELECT currentUser()", user="john", cert_name="wrong")
-        err_str = str(err.value)
-        if count < MAX_RETRY and (
-            ("Broken pipe" in err_str) or ("EOF occurred" in err_str)
-        ):
-            count = count + 1
-            logging.warning(f"Failed attempt with wrong cert, err: {err_str}")
-            continue
-        assert "unknown ca" in err_str
-        break
+    # TODO: Add non-flaky tests for:
+    # - Wrong certificate: self-signed certificate.
 
     # No certificate.
     with pytest.raises(Exception) as err:
@@ -193,49 +181,8 @@ def test_https_non_ssl_auth():
         == "jane\n"
     )
 
-    count = 0
-    # However if we send a certificate it must not be wrong.
-    while count <= MAX_RETRY:
-        with pytest.raises(Exception) as err:
-            execute_query_https(
-                "SELECT currentUser()",
-                user="peter",
-                enable_ssl_auth=False,
-                cert_name="wrong",
-            )
-        err_str = str(err.value)
-        if count < MAX_RETRY and (
-            ("Broken pipe" in err_str) or ("EOF occurred" in err_str)
-        ):
-            count = count + 1
-            logging.warning(
-                f"Failed attempt with wrong cert, user: peter, err: {err_str}"
-            )
-            continue
-        assert "unknown ca" in err_str
-        break
-
-    count = 0
-    while count <= MAX_RETRY:
-        with pytest.raises(Exception) as err:
-            execute_query_https(
-                "SELECT currentUser()",
-                user="jane",
-                enable_ssl_auth=False,
-                password="qwe123",
-                cert_name="wrong",
-            )
-        err_str = str(err.value)
-        if count < MAX_RETRY and (
-            ("Broken pipe" in err_str) or ("EOF occurred" in err_str)
-        ):
-            count = count + 1
-            logging.warning(
-                f"Failed attempt with wrong cert, user: jane, err: {err_str}"
-            )
-            continue
-        assert "unknown ca" in err_str
-        break
+    # TODO: Add non-flaky tests for:
+    # - sending wrong cert
 
 
 def test_create_user():