@@ -1450,20 +1450,11 @@ async def test_server_session_keep_alive(conn_cnx):
1450
1450
1451
1451
1452
1452
@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 ):
1454
1454
caplog .set_level (logging .DEBUG , "snowflake.connector.aio._ocsp_snowflake" )
1455
1455
async with conn_cnx (disable_ocsp_checks = True ) as conn , conn .cursor () as cur :
1456
1456
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
1467
1458
1468
1459
1469
1460
@pytest .mark .skipolddriver
@@ -1472,10 +1463,10 @@ async def test_ocsp_mode_insecure_mode(conn_cnx, is_public_test, caplog):
1472
1463
async with conn_cnx (insecure_mode = True ) as conn , conn .cursor () as cur :
1473
1464
assert await (await cur .execute ("select 1" )).fetchall () == [(1 ,)]
1474
1465
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
1476
1467
assert "This connection does not perform OCSP checks." in caplog .text
1477
1468
else :
1478
- assert "snowflake.connector.aio._ocsp_snowflake" not in caplog .text
1469
+ assert "snowflake.connector.aio._ocsp_snowflake: " not in caplog .text
1479
1470
1480
1471
1481
1472
@pytest .mark .skipolddriver
@@ -1488,14 +1479,14 @@ async def test_ocsp_mode_insecure_mode_and_disable_ocsp_checks_match(
1488
1479
) as conn , conn .cursor () as cur :
1489
1480
assert await (await cur .execute ("select 1" )).fetchall () == [(1 ,)]
1490
1481
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
1492
1483
assert (
1493
1484
"The values for 'disable_ocsp_checks' and 'insecure_mode' differ. "
1494
1485
"Using the value of 'disable_ocsp_checks."
1495
1486
) not in caplog .text
1496
1487
assert "This connection does not perform OCSP checks." in caplog .text
1497
1488
else :
1498
- assert "snowflake.connector.aio._ocsp_snowflake" not in caplog .text
1489
+ assert "snowflake.connector.aio._ocsp_snowflake: " not in caplog .text
1499
1490
1500
1491
1501
1492
@pytest .mark .skipolddriver
@@ -1508,34 +1499,30 @@ async def test_ocsp_mode_insecure_mode_and_disable_ocsp_checks_mismatch_ocsp_dis
1508
1499
) as conn , conn .cursor () as cur :
1509
1500
assert await (await cur .execute ("select 1" )).fetchall () == [(1 ,)]
1510
1501
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
1512
1503
assert (
1513
1504
"The values for 'disable_ocsp_checks' and 'insecure_mode' differ. "
1514
1505
"Using the value of 'disable_ocsp_checks."
1515
1506
) in caplog .text
1516
1507
assert "This connection does not perform OCSP checks." in caplog .text
1517
1508
else :
1518
- assert "snowflake.connector.aio._ocsp_snowflake" not in caplog .text
1509
+ assert "snowflake.connector.aio._ocsp_snowflake: " not in caplog .text
1519
1510
1520
1511
1521
1512
@pytest .mark .skipolddriver
1522
1513
async def test_ocsp_mode_insecure_mode_and_disable_ocsp_checks_mismatch_ocsp_enabled (
1523
- conn_cnx , is_public_test , caplog
1514
+ conn_cnx , caplog
1524
1515
):
1525
1516
caplog .set_level (logging .DEBUG , "snowflake.connector.aio._ocsp_snowflake" )
1526
1517
async with conn_cnx (
1527
1518
insecure_mode = True , disable_ocsp_checks = False
1528
1519
) as conn , conn .cursor () as cur :
1529
1520
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
1539
1526
1540
1527
1541
1528
@pytest .mark .skipolddriver
0 commit comments