Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
1 change: 1 addition & 0 deletions scripts/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
2 changes: 2 additions & 0 deletions tests/test_run_test_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}
)
Expand All @@ -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
Expand Down
Loading