@@ -1450,20 +1450,11 @@ async def test_server_session_keep_alive(conn_cnx):
14501450
14511451
14521452@pytest .mark .skipolddriver
1453- async def test_ocsp_mode_disable_ocsp_checks (conn_cnx , is_public_test , caplog ):
1453+ async def test_ocsp_mode_disable_ocsp_checks (conn_cnx , caplog ):
14541454 caplog .set_level (logging .DEBUG , "snowflake.connector.aio._ocsp_snowflake" )
14551455 async with conn_cnx (disable_ocsp_checks = True ) as conn , conn .cursor () as cur :
14561456 assert await (await cur .execute ("select 1" )).fetchall () == [(1 ,)]
1457- assert "snowflake.connector.aio._ocsp_snowflake" not in caplog .text
1458- caplog .clear ()
1459-
1460- async with conn_cnx () as conn , conn .cursor () as cur :
1461- assert await (await cur .execute ("select 1" )).fetchall () == [(1 ,)]
1462- if is_public_test :
1463- assert "snowflake.connector.aio._ocsp_snowflake" in caplog .text
1464- assert "This connection does not perform OCSP checks." not in caplog .text
1465- else :
1466- assert "snowflake.connector.aio._ocsp_snowflake" not in caplog .text
1457+ assert "snowflake.connector.aio._ocsp_snowflake:" not in caplog .text
14671458
14681459
14691460@pytest .mark .skipolddriver
@@ -1472,10 +1463,10 @@ async def test_ocsp_mode_insecure_mode(conn_cnx, is_public_test, caplog):
14721463 async with conn_cnx (insecure_mode = True ) as conn , conn .cursor () as cur :
14731464 assert await (await cur .execute ("select 1" )).fetchall () == [(1 ,)]
14741465 if is_public_test :
1475- assert "snowflake.connector.aio._ocsp_snowflake" not in caplog .text
1466+ assert "snowflake.connector.aio._ocsp_snowflake: " not in caplog .text
14761467 assert "This connection does not perform OCSP checks." in caplog .text
14771468 else :
1478- assert "snowflake.connector.aio._ocsp_snowflake" not in caplog .text
1469+ assert "snowflake.connector.aio._ocsp_snowflake: " not in caplog .text
14791470
14801471
14811472@pytest .mark .skipolddriver
@@ -1488,14 +1479,14 @@ async def test_ocsp_mode_insecure_mode_and_disable_ocsp_checks_match(
14881479 ) as conn , conn .cursor () as cur :
14891480 assert await (await cur .execute ("select 1" )).fetchall () == [(1 ,)]
14901481 if is_public_test :
1491- assert "snowflake.connector.aio._ocsp_snowflake" not in caplog .text
1482+ assert "snowflake.connector.aio._ocsp_snowflake: " not in caplog .text
14921483 assert (
14931484 "The values for 'disable_ocsp_checks' and 'insecure_mode' differ. "
14941485 "Using the value of 'disable_ocsp_checks."
14951486 ) not in caplog .text
14961487 assert "This connection does not perform OCSP checks." in caplog .text
14971488 else :
1498- assert "snowflake.connector.aio._ocsp_snowflake" not in caplog .text
1489+ assert "snowflake.connector.aio._ocsp_snowflake: " not in caplog .text
14991490
15001491
15011492@pytest .mark .skipolddriver
@@ -1508,34 +1499,30 @@ async def test_ocsp_mode_insecure_mode_and_disable_ocsp_checks_mismatch_ocsp_dis
15081499 ) as conn , conn .cursor () as cur :
15091500 assert await (await cur .execute ("select 1" )).fetchall () == [(1 ,)]
15101501 if is_public_test :
1511- assert "snowflake.connector.aio._ocsp_snowflake" not in caplog .text
1502+ assert "snowflake.connector.aio._ocsp_snowflake: " not in caplog .text
15121503 assert (
15131504 "The values for 'disable_ocsp_checks' and 'insecure_mode' differ. "
15141505 "Using the value of 'disable_ocsp_checks."
15151506 ) in caplog .text
15161507 assert "This connection does not perform OCSP checks." in caplog .text
15171508 else :
1518- assert "snowflake.connector.aio._ocsp_snowflake" not in caplog .text
1509+ assert "snowflake.connector.aio._ocsp_snowflake: " not in caplog .text
15191510
15201511
15211512@pytest .mark .skipolddriver
15221513async def test_ocsp_mode_insecure_mode_and_disable_ocsp_checks_mismatch_ocsp_enabled (
1523- conn_cnx , is_public_test , caplog
1514+ conn_cnx , caplog
15241515):
15251516 caplog .set_level (logging .DEBUG , "snowflake.connector.aio._ocsp_snowflake" )
15261517 async with conn_cnx (
15271518 insecure_mode = True , disable_ocsp_checks = False
15281519 ) as conn , conn .cursor () as cur :
15291520 assert await (await cur .execute ("select 1" )).fetchall () == [(1 ,)]
1530- if is_public_test :
1531- assert "snowflake.connector.aio._ocsp_snowflake" in caplog .text
1532- assert (
1533- "The values for 'disable_ocsp_checks' and 'insecure_mode' differ. "
1534- "Using the value of 'disable_ocsp_checks."
1535- ) in caplog .text
1536- assert "This connection does not perform OCSP checks." not in caplog .text
1537- else :
1538- assert "snowflake.connector.aio._ocsp_snowflake" not in caplog .text
1521+ assert (
1522+ "The values for 'disable_ocsp_checks' and 'insecure_mode' differ. "
1523+ "Using the value of 'disable_ocsp_checks."
1524+ ) in caplog .text
1525+ assert "snowflake.connector.aio._ocsp_snowflake:" in caplog .text
15391526
15401527
15411528@pytest .mark .skipolddriver
0 commit comments