Skip to content

test: skip client options integration cases on Cassandra - #1278

Merged
dkropachev merged 1 commit into
scylladb:masterfrom
obaseyi2:fix/scylla-only-client-options
Nov 17, 2026
Merged

dkropachev merged 1 commit into
scylladb:masterfrom
obaseyi2:fix/scylla-only-client-options

Conversation

@obaseyi2

Copy link
Copy Markdown

Summary

  • Add a reusable ScyllaDB-only marker for integration tests.
  • Skip client-options application info and driver-config tests when running against Cassandra. These tests query ScyllaDB-only columns and currently fail before their assertions.

Fixes #993

Validation

  • Compiled the three changed Python modules with py_compile.
  • Integration tests require a running database and pytest, which are not available in this checkout.

@coderabbitai

coderabbitai Bot commented Nov 17, 2026 •

Copy link
Copy Markdown

Explain Change →

No actionable comments were generated in the recent review.

Summary

Summary by CodeRabbit

  • Tests
    • ScyllaDB-specific integration checks are now skipped when SCYLLA_VERSION is unset and run when it is configured. This affects application information and driver configuration checks; their existing version-based expected-failure conditions remain in place.

Adds the requires_scylla pytest marker. It skips marked tests when SCYLLA_VERSION is unset. Applies the marker to ApplicationInfoTest and DriverConfigReportingTest; their existing version-based xfail decorators remain.

Suggested reviewers: sylwiaszunejko, dkropachev

Change: Other · Severity of issue fixed: Low

Merge Risk: Minimal · up to a284f

This change makes two integration test classes skip when run against Cassandra without SCYLLA_VERSION set. Library behavior is unaffected, and it is safe to merge.

Pre-merge checks: Passed 4

Check name Status Explanation
Title check Passed The title names the main change: client-options integration cases are skipped on Cassandra. It matches the changeset, which adds a ScyllaDB-only marker and applies it to the application-info and drive…
Description check Passed The description follows the template's intent. It gives a summary of the marker and the two skipped test modules, links the issue with 'Fixes #993', and records validation steps. Template checklist it…
Linked Issues check Passed [#993] Requirement: a reusable ScyllaDB-only marker, applied to the application-info and driver-config tests so they skip when SCYLLA_VERSION is unset. The diff adds `requires_scylla = pytest.mark.ski…
Out of Scope Changes check Passed All changes implement #993. The marker helper is the reusable mechanism the issue requests. The two test-file edits apply it to the two affected classes and add the matching import. No unrelated chang…
Full details: Title check

Explanation

The title names the main change: client-options integration cases are skipped on Cassandra. It matches the changeset, which adds a ScyllaDB-only marker and applies it to the application-info and driver-config tests. The title says 'client options' while the diff only covers two test classes, which is a minor breadth point, not a mismatch.

Full details: Description check

Explanation

The description follows the template's intent. It gives a summary of the marker and the two skipped test modules, links the issue with 'Fixes #993', and records validation steps. Template checklist items (split commits, docstrings, docs updates, tests added) are not addressed. The validation section states integration tests were not run, which leaves the change unverified by tests.

Full details: Linked Issues check

Explanation

[#993] Requirement: a reusable ScyllaDB-only marker, applied to the application-info and driver-config tests so they skip when SCYLLA_VERSION is unset. The diff adds requires_scylla = pytest.mark.skipif(SCYLLA_VERSION is None, reason='Requires ScyllaDB') in tests/integration/init.py. It applies this marker to ApplicationInfoTest (test_application_info.py) and DriverConfigReportingTest (test_driver_config.py). The existing xfail_scylla_version_lt decorators are unchanged, so the older-Scylla behavior is preserved, as the issue requests. The marker is a class-level skip, so all cases in both classes skip on Cassandra. Integration tests were not run. The pass rests on the source diff, not on a test run.

Full details: Out of Scope Changes check

Explanation

All changes implement #993. The marker helper is the reusable mechanism the issue requests. The two test-file edits apply it to the two affected classes and add the matching import. No unrelated changes appear in the diff.

  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Recent review info

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: QUIET
  • Plan: Advanced
  • Run ID: c15a6c4f-a60c-4cd3-9fa2-8ec061c7f16f
Commits

Reviewing files that changed from the base of the PR and between 96b9d91 and a284f01.

Files selected for processing: 3

  • tests/integration/__init__.py
  • tests/integration/standard/test_application_info.py
  • tests/integration/standard/test_driver_config.py

Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.

@dkropachev
dkropachev merged commit 882b21b into scylladb:master Nov 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

xfail_scylla_version_lt does nothing when SCYLLA_VERSION is unset

2 participants