diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 6018042..8082807 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -217,6 +217,10 @@ jobs: PROTOCOLS: ${{ inputs.protocols }} SCYLLA_VERSION: ${{ steps.resolve.outputs.scylla_version }} TESTS: ${{ inputs.tests }} + # Scylla 2025.1 lacks experimental tablet V2, its TLS resumption + # assertions fail, and the application-info strict xfail is outdated. + PYTEST_ADDOPTS: >- + ${{ inputs.driver_type == 'scylla' && startsWith(steps.resolve.outputs.scylla_version, 'release:2025.1.') && '--ignore=tests/integration/standard/test_tablets_routing_v2.py --deselect=tests/integration/standard/test_application_info.py::ApplicationInfoTest::test_create_session_and_check_system_views_clients --deselect=tests/integration/standard/test_tls_resumption.py::TLSSessionResumptionTests::test_every_connection_resumes_from_a_warmed_cache --deselect=tests/integration/standard/test_tls_resumption.py::TLSSessionResumptionTests::test_resumption_is_on_by_default_with_an_ssl_context' || '' }} run: | set -euo pipefail versions="${DRIVER_REF:-1}" diff --git a/scripts/run_test.sh b/scripts/run_test.sh index 9e9b9f3..5ee4cd5 100755 --- a/scripts/run_test.sh +++ b/scripts/run_test.sh @@ -145,6 +145,7 @@ docker_cmd="docker run --init --detach=true \ -e DEV_MODE \ -e PIP_CACHE_DIR \ -e UV_CACHE_DIR \ + -e PYTEST_ADDOPTS \ -e WORKSPACE \ ${BUILD_OPTIONS} \ ${JOB_OPTIONS} \ diff --git a/tests/test_run_test_script.py b/tests/test_run_test_script.py index c42a844..56aed7d 100644 --- a/tests/test_run_test_script.py +++ b/tests/test_run_test_script.py @@ -61,6 +61,7 @@ def test_run_test_constructs_one_docker_command_with_workspace_env(tmp_path): "PYTHON_MATRIX_DIR": str(REPO_ROOT), "PYTHON_DRIVER_DIR": str(tmp_path / "python-driver"), "SCYLLA_VERSION": "2026.1.3", + "PYTEST_ADDOPTS": "--ignore=tests/integration/standard/test_tablets_routing_v2.py", "FAKE_DOCKER_CALLS": str(calls_file), } ) @@ -82,6 +83,7 @@ def test_run_test_constructs_one_docker_command_with_workspace_env(tmp_path): run_call = f" {calls[0]} " assert " -e PIP_CACHE_DIR " in run_call assert " -e UV_CACHE_DIR " in run_call + assert " -e PYTEST_ADDOPTS " in run_call assert " -e WORKSPACE " in run_call assert f" -v {home}/.pip-cache:{home}/.pip-cache " in run_call assert f" -v {home}/.uv-cache:{home}/.uv-cache " in run_call