fix sync tests

Author: sfc-gh-pczajka

test/integ/test_connection.py

@@ -1370,92 +1370,76 @@ def test_server_session_keep_alive(conn_cnx):
 
 
 @pytest.mark.skipolddriver
-def test_ocsp_mode_disable_ocsp_checks(conn_cnx, is_public_test, caplog):
+def test_ocsp_mode_disable_ocsp_checks(conn_cnx, caplog):
     caplog.set_level(logging.DEBUG, "snowflake.connector.ocsp_snowflake")
     with conn_cnx(disable_ocsp_checks=True) as conn, conn.cursor() as cur:
         assert cur.execute("select 1").fetchall() == [(1,)]
-        assert "snowflake.connector.ocsp_snowflake" not in caplog.text
-        caplog.clear()
-
-    with conn_cnx() as conn, conn.cursor() as cur:
-        assert cur.execute("select 1").fetchall() == [(1,)]
-        if is_public_test:
-            assert "snowflake.connector.ocsp_snowflake" in caplog.text
-            assert "This connection does not perform OCSP checks." not in caplog.text
-        else:
-            assert "snowflake.connector.ocsp_snowflake" not in caplog.text
+        assert "snowflake.connector.ocsp_snowflake:" not in caplog.text
 
 
 @pytest.mark.skipolddriver
-def test_ocsp_mode_insecure_mode(conn_cnx, is_public_test, caplog):
+def test_ocsp_mode_insecure_mode(conn_cnx, caplog):
     caplog.set_level(logging.DEBUG, "snowflake.connector.ocsp_snowflake")
     with conn_cnx(insecure_mode=True) as conn, conn.cursor() as cur:
         assert cur.execute("select 1").fetchall() == [(1,)]
-        if is_public_test:
-            assert "snowflake.connector.ocsp_snowflake" not in caplog.text
-            assert "This connection does not perform OCSP checks." in caplog.text
-        else:
-            assert "snowflake.connector.ocsp_snowflake" not in caplog.text
+        # insecure_mode=True means OCSP is disabled
+        assert "snowflake.connector.ocsp_snowflake:" not in caplog.text
+        assert "This connection does not perform OCSP checks." in caplog.text
 
 
 @pytest.mark.skipolddriver
-def test_ocsp_mode_insecure_mode_and_disable_ocsp_checks_match(
-    conn_cnx, is_public_test, caplog
-):
+def test_ocsp_mode_insecure_mode_and_disable_ocsp_checks_match(conn_cnx, caplog):
     caplog.set_level(logging.DEBUG, "snowflake.connector.ocsp_snowflake")
     with conn_cnx(
         insecure_mode=True, disable_ocsp_checks=True
     ) as conn, conn.cursor() as cur:
         assert cur.execute("select 1").fetchall() == [(1,)]
-        if is_public_test:
-            assert "snowflake.connector.ocsp_snowflake" not in caplog.text
-            assert (
-                "The values for 'disable_ocsp_checks' and 'insecure_mode' differ. "
-                "Using the value of 'disable_ocsp_checks."
-            ) not in caplog.text
-            assert "This connection does not perform OCSP checks." in caplog.text
-        else:
-            assert "snowflake.connector.ocsp_snowflake" not in caplog.text
+        assert "snowflake.connector.ocsp_snowflake" not in caplog.text
+        assert (
+            "The values for 'disable_ocsp_checks' and 'insecure_mode' differ. "
+            "Using the value of 'disable_ocsp_checks."
+        ) not in caplog.text
+        assert "This connection does not perform OCSP checks." in caplog.text
 
 
 @pytest.mark.skipolddriver
 def test_ocsp_mode_insecure_mode_and_disable_ocsp_checks_mismatch_ocsp_disabled(
-    conn_cnx, is_public_test, caplog
+    conn_cnx, caplog
 ):
     caplog.set_level(logging.DEBUG, "snowflake.connector.ocsp_snowflake")
     with conn_cnx(
         insecure_mode=False, disable_ocsp_checks=True
     ) as conn, conn.cursor() as cur:
         assert cur.execute("select 1").fetchall() == [(1,)]
-        if is_public_test:
-            assert "snowflake.connector.ocsp_snowflake" not in caplog.text
-            assert (
-                "The values for 'disable_ocsp_checks' and 'insecure_mode' differ. "
-                "Using the value of 'disable_ocsp_checks."
-            ) in caplog.text
-            assert "This connection does not perform OCSP checks." in caplog.text
-        else:
-            assert "snowflake.connector.ocsp_snowflake" not in caplog.text
+        # disable_ocsp_checks=True takes precedence, so OCSP should be disabled
+        assert "snowflake.connector.ocsp_snowflake:" not in caplog.text
+        assert (
+            "The values for 'disable_ocsp_checks' and 'insecure_mode' differ. "
+            "Using the value of 'disable_ocsp_checks."
+        ) in caplog.text
 
 
 @pytest.mark.skipolddriver
 def test_ocsp_mode_insecure_mode_and_disable_ocsp_checks_mismatch_ocsp_enabled(
-    conn_cnx, is_public_test, caplog
+    conn_cnx, caplog
 ):
     caplog.set_level(logging.DEBUG, "snowflake.connector.ocsp_snowflake")
     with conn_cnx(
         insecure_mode=True, disable_ocsp_checks=False
     ) as conn, conn.cursor() as cur:
         assert cur.execute("select 1").fetchall() == [(1,)]
-        if is_public_test:
-            assert "snowflake.connector.ocsp_snowflake" in caplog.text
-            assert (
-                "The values for 'disable_ocsp_checks' and 'insecure_mode' differ. "
-                "Using the value of 'disable_ocsp_checks."
-            ) in caplog.text
+        # disable_ocsp_checks=False takes precedence, so OCSP should be enabled
+        assert (
+            "The values for 'disable_ocsp_checks' and 'insecure_mode' differ. "
+            "Using the value of 'disable_ocsp_checks."
+        ) in caplog.text
+        if "This connection is in OCSP Fail Open Mode" in caplog.text:
+            # OCSP is enabled, should see OCSP activity
+            assert "snowflake.connector.ocsp_snowflake:" in caplog.text
             assert "This connection does not perform OCSP checks." not in caplog.text
         else:
-            assert "snowflake.connector.ocsp_snowflake" not in caplog.text
+            # OCSP is disabled, should not see OCSP activity
+            assert "snowflake.connector.ocsp_snowflake:" not in caplog.text
 
 
 @pytest.mark.skipolddriver