SNOW-3192362: Fix AWS integration regressions without matrix changes (#2819)

Author: sfc-gh-fpawlowski

test/integ/aio_it/conftest.py

@@ -9,10 +9,11 @@
     get_db_parameters,
     is_public_testaccount,
 )
-from typing import Any, AsyncContextManager, AsyncGenerator, Callable
+from typing import Any, AsyncContextManager, AsyncGenerator, Callable, Generator
 
 import pytest
 
+import snowflake.connector
 from snowflake.connector.aio import SnowflakeConnection
 from snowflake.connector.aio import connect as async_connect
 from snowflake.connector.aio._telemetry import TelemetryClient
@@ -143,6 +144,16 @@ def conn_cnx():
     return db
 
 
+@pytest.fixture(autouse=True)
+def reset_default_paramstyle() -> Generator[None, None, None]:
+    """Keep async integration tests isolated from global paramstyle changes."""
+    snowflake.connector.paramstyle = "pyformat"
+    try:
+        yield
+    finally:
+        snowflake.connector.paramstyle = "pyformat"
+
+
 @pytest.fixture()
 async def conn_testaccount() -> AsyncGenerator[SnowflakeConnection, None]:
     connection = await create_connection("default")

test/integ/aio_it/test_multi_statement_async.py

@@ -73,7 +73,7 @@ async def _check_multi_statement_results(
 
 async def test_multi_statement_basic(conn_cnx, skip_to_last_set: bool):
     """Selects fixed integer data using statement level parameters."""
-    async with conn_cnx() as con:
+    async with conn_cnx(paramstyle="pyformat") as con:
         async with con.cursor() as cur:
             statement_params = dict()
             await cur.execute(
@@ -144,7 +144,7 @@ async def test_binding_multi(conn_cnx, style: str, skip_to_last_set: bool):
 @pytest.mark.parametrize("cursor_class", [SnowflakeCursor, DictCursor])
 async def test_async_exec_multi(conn_cnx, cursor_class, skip_to_last_set: bool):
     """Tests whether async execution query works within a multi-statement"""
-    async with conn_cnx() as con:
+    async with conn_cnx(paramstyle="pyformat") as con:
         async with con.cursor(cursor_class) as cur:
             await cur.execute_async(
                 "select 1; select 2; select count(*) from table(generator(timeLimit => 1)); select 'b';",
@@ -153,7 +153,7 @@ async def test_async_exec_multi(conn_cnx, cursor_class, skip_to_last_set: bool):
             q_id = cur.sfqid
             assert con.is_still_running(await con.get_query_status(q_id))
         await _wait_while_query_running_async(con, q_id, sleep_time=1)
-    async with conn_cnx() as con:
+    async with conn_cnx(paramstyle="pyformat") as con:
         async with con.cursor(cursor_class) as cur:
             await _wait_until_query_success_async(
                 con, q_id, num_checks=3, sleep_per_check=1
@@ -318,7 +318,7 @@ async def test_executemany_multi(conn_cnx, skip_to_last_set: bool):
     """Tests executemany with multi-statement optimizations enabled through the num_statements parameter."""
     table1 = random_string(5, "test_executemany_multi_")
     table2 = random_string(5, "test_executemany_multi_")
-    async with conn_cnx() as con:
+    async with conn_cnx(paramstyle="pyformat") as con:
         async with con.cursor() as cur:
             await cur.execute(
                 f"create temp table {table1} (aa number); create temp table {table2} (bb number);",

test/integ/aio_it/test_numpy_binding_async.py

@@ -62,7 +62,7 @@ async def test_numpy_datatype_binding(conn_cnx, db_parameters):
         },
     ]
     try:
-        async with conn_cnx(numpy=True) as cnx:
+        async with conn_cnx(numpy=True, paramstyle="pyformat") as cnx:
             await cnx.cursor().execute(
                 """
 CREATE OR REPLACE TABLE {name} (

test/integ/conftest.py

@@ -406,6 +406,16 @@ def fin():
     return connection
 
 
+@pytest.fixture(autouse=True)
+def reset_default_paramstyle() -> Generator[None]:
+    """Keep tests isolated from process-global paramstyle changes."""
+    snowflake.connector.paramstyle = "pyformat"
+    try:
+        yield
+    finally:
+        snowflake.connector.paramstyle = "pyformat"
+
+
 @pytest.fixture()
 def conn_cnx() -> Callable[..., ContextManager[SnowflakeConnection]]:
     return db

test/integ/test_large_result_set.py

@@ -4,6 +4,7 @@
 import logging
 import threading
 from unittest.mock import Mock
+from urllib.parse import urlparse
 
 import pytest
 
@@ -274,7 +275,8 @@ def send_strip_encoding(self, request, *args, **kwargs):
         HTTP round-trip but before requests reads the body."""
         nonlocal chunks_intercepted
         response = original_send(self, request, *args, **kwargs)
-        if response.status_code == 200:
+        hostname = urlparse(request.url).hostname or ""
+        if response.status_code == 200 and "snowflakecomputing." not in hostname:
             _strip_content_encoding(response)
             with chunks_intercepted_lock:
                 chunks_intercepted += 1

test/integ/test_multi_statement.py

@@ -86,7 +86,7 @@ def _check_multi_statement_results(
 
 def test_multi_statement_basic(conn_cnx, skip_to_last_set: bool):
     """Selects fixed integer data using statement level parameters."""
-    with conn_cnx() as con:
+    with conn_cnx(paramstyle="pyformat") as con:
         with con.cursor() as cur:
             statement_params = dict()
             cur.execute(
@@ -157,7 +157,7 @@ def test_binding_multi(conn_cnx, style: str, skip_to_last_set: bool):
 @pytest.mark.parametrize("cursor_class", [SnowflakeCursor, DictCursor])
 def test_async_exec_multi(conn_cnx, cursor_class, skip_to_last_set: bool):
     """Tests whether async execution query works within a multi-statement"""
-    with conn_cnx() as con:
+    with conn_cnx(paramstyle="pyformat") as con:
         with con.cursor(cursor_class) as cur:
             cur.execute_async(
                 "select 1; select 2; select count(*) from table(generator(timeLimit => 1)); select 'b';",
@@ -166,7 +166,7 @@ def test_async_exec_multi(conn_cnx, cursor_class, skip_to_last_set: bool):
             q_id = cur.sfqid
             assert con.is_still_running(con.get_query_status(q_id))
         _wait_while_query_running(con, q_id, sleep_time=1)
-    with conn_cnx() as con:
+    with conn_cnx(paramstyle="pyformat") as con:
         with con.cursor(cursor_class) as cur:
             _wait_until_query_success(con, q_id, num_checks=3, sleep_per_check=1)
             assert con.get_query_status_throw_if_error(q_id) == QueryStatus.SUCCESS
@@ -322,7 +322,7 @@ def test_executemany_multi(conn_cnx, skip_to_last_set: bool):
     """Tests executemany with multi-statement optimizations enabled through the num_statements parameter."""
     table1 = random_string(5, "test_executemany_multi_")
     table2 = random_string(5, "test_executemany_multi_")
-    with conn_cnx() as con:
+    with conn_cnx(paramstyle="pyformat") as con:
         with con.cursor() as cur:
             cur.execute(
                 f"create temp table {table1} (aa number); create temp table {table2} (bb number);",

test/integ/test_numpy_binding.py

@@ -58,7 +58,7 @@ def test_numpy_datatype_binding(conn_cnx, db_parameters):
         },
     ]
     try:
-        with conn_cnx(numpy=True) as cnx:
+        with conn_cnx(numpy=True, paramstyle="pyformat") as cnx:
             cnx.cursor().execute(
                 """
 CREATE OR REPLACE TABLE {name} (

tox.ini

@@ -40,7 +40,7 @@ setenv =
     unit: SNOWFLAKE_TEST_TYPE = unit
     integ: SNOWFLAKE_TEST_TYPE = integ
     single: SNOWFLAKE_TEST_TYPE = single
-    parallel: SNOWFLAKE_PYTEST_OPTS = {env:SNOWFLAKE_PYTEST_OPTS:} -n auto
+    parallel: SNOWFLAKE_PYTEST_OPTS = {env:SNOWFLAKE_PYTEST_OPTS:} -n auto --dist worksteal
     # Add common parts into pytest command
     SNOWFLAKE_PYTEST_COV_LOCATION = {env:JUNIT_REPORT_DIR:{toxworkdir}}/junit.{envname}-{env:cloud_provider:dev}.xml
     SNOWFLAKE_PYTEST_COV_CMD = --cov snowflake.connector --junitxml {env:SNOWFLAKE_PYTEST_COV_LOCATION} --cov-report=
@@ -185,8 +185,9 @@ depends = py39, py310, py311, py312, py313, py314
 
 [pytest]
 log_level = info
-addopts = -ra --strict-markers
+addopts = -ra --strict-markers -vvv
 junit_family = xunit2
+timeout = 1200
 filterwarnings =
     error::UserWarning:cryptography.*
     error::cryptography.utils.CryptographyDeprecationWarning