Add async version of tests from #2165

Author: sfc-gh-pczajka

test/integ/aio/test_connection_async.py

@@ -348,18 +348,6 @@ async def test_bogus(db_parameters):
     Notes:
         This takes a long time.
     """
-    with pytest.raises(DatabaseError):
-        async with snowflake.connector.aio.SnowflakeConnection(
-            protocol="http",
-            user="bogus",
-            password="bogus",
-            host=db_parameters["host"],
-            port=db_parameters["port"],
-            account=db_parameters["account"],
-            login_timeout=5,
-        ):
-            pass
-
     with pytest.raises(DatabaseError):
         async with snowflake.connector.aio.SnowflakeConnection(
             protocol="http",
@@ -369,7 +357,7 @@ async def test_bogus(db_parameters):
             host=db_parameters["host"],
             port=db_parameters["port"],
             login_timeout=5,
-            insecure_mode=True,
+            disable_ocsp_checks=True,
         ):
             pass
 
@@ -1450,19 +1438,111 @@ async def test_server_session_keep_alive(conn_cnx):
 
 
 @pytest.mark.skipolddriver
-async def test_ocsp_mode_insecure(conn_cnx, is_public_test, caplog):
-    caplog.set_level(logging.DEBUG, "snowflake.connector.ocsp_snowflake")
+@pytest.mark.parametrize("disable_ocsp_checks", [True, False, None])
+async def test_ocsp_mode_disable_ocsp_checks(
+    conn_cnx, is_public_test, is_local_dev_setup, caplog, disable_ocsp_checks
+):
+    caplog.set_level(logging.DEBUG, "snowflake.connector.aio._ocsp_snowflake")
+    kwargs = (
+        {"disable_ocsp_checks": disable_ocsp_checks}
+        if disable_ocsp_checks is not None
+        else {}
+    )
+    async with conn_cnx(**kwargs) as conn, conn.cursor() as cur:
+        assert await (await cur.execute("select 1")).fetchall() == [(1,)]
+        if disable_ocsp_checks is True:
+            assert "snowflake.connector.aio._ocsp_snowflake" not in caplog.text
+        else:
+            if is_public_test or is_local_dev_setup:
+                assert "snowflake.connector.aio._ocsp_snowflake" in caplog.text
+                assert (
+                    "This connection does not perform OCSP checks." not in caplog.text
+                )
+            else:
+                assert "snowflake.connector.aio._ocsp_snowflake" not in caplog.text
+
+
+@pytest.mark.skipolddriver
+async def test_ocsp_mode_insecure_mode(
+    conn_cnx, is_public_test, is_local_dev_setup, caplog
+):
+    caplog.set_level(logging.DEBUG, "snowflake.connector.aio._ocsp_snowflake")
     async with conn_cnx(insecure_mode=True) as conn, conn.cursor() as cur:
         assert await (await cur.execute("select 1")).fetchall() == [(1,)]
-        assert "snowflake.connector.ocsp_snowflake" not in caplog.text
-        caplog.clear()
+        assert "snowflake.connector.aio._ocsp_snowflake" not in caplog.text
+        if is_public_test or is_local_dev_setup:
+            assert "This connection does not perform OCSP checks." in caplog.text
+
 
-    async with conn_cnx() as conn, conn.cursor() as cur:
+@pytest.mark.skipolddriver
+async def test_ocsp_mode_insecure_mode_and_disable_ocsp_checks_match(
+    conn_cnx, is_public_test, is_local_dev_setup, caplog
+):
+    caplog.set_level(logging.DEBUG, "snowflake.connector.aio._ocsp_snowflake")
+    async with conn_cnx(
+        insecure_mode=True, disable_ocsp_checks=True
+    ) as conn, conn.cursor() as cur:
+        assert await (await cur.execute("select 1")).fetchall() == [(1,)]
+        assert "snowflake.connector.aio._ocsp_snowflake" not in caplog.text
+        if is_public_test or is_local_dev_setup:
+            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
+async def test_ocsp_mode_insecure_mode_and_disable_ocsp_checks_mismatch_ocsp_disabled(
+    conn_cnx, is_public_test, is_local_dev_setup, caplog
+):
+    caplog.set_level(logging.DEBUG, "snowflake.connector.aio._ocsp_snowflake")
+    async with conn_cnx(
+        insecure_mode=False, disable_ocsp_checks=True
+    ) as conn, conn.cursor() as cur:
+        assert await (await cur.execute("select 1")).fetchall() == [(1,)]
+        assert "snowflake.connector.aio._ocsp_snowflake" not in caplog.text
+        if is_public_test or is_local_dev_setup:
+            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
+
+
+@pytest.mark.skipolddriver
+async def test_ocsp_mode_insecure_mode_and_disable_ocsp_checks_mismatch_ocsp_enabled(
+    conn_cnx, is_public_test, is_local_dev_setup, caplog
+):
+    caplog.set_level(logging.DEBUG, "snowflake.connector.aio._ocsp_snowflake")
+    async with conn_cnx(
+        insecure_mode=True, disable_ocsp_checks=False
+    ) as conn, conn.cursor() as cur:
         assert await (await cur.execute("select 1")).fetchall() == [(1,)]
-        if is_public_test:
-            assert "snowflake.connector.ocsp_snowflake" in caplog.text
+        if is_public_test or is_local_dev_setup:
+            assert "snowflake.connector.aio._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
+            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.aio._ocsp_snowflake" not in caplog.text
+
+
+@pytest.mark.skipolddriver
+async def test_ocsp_mode_insecure_mode_deprecation_warning(conn_cnx):
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("ignore")
+        warnings.filterwarnings(
+            "always", category=DeprecationWarning, message=".*insecure_mode"
+        )
+        async with conn_cnx(insecure_mode=True):
+            assert len(w) == 1
+            assert issubclass(w[0].category, DeprecationWarning)
+            assert "The 'insecure_mode' connection property is deprecated." in str(
+                w[0].message
+            )
 
 
 @pytest.mark.skipolddriver