Skip to content

geotiff tests: consolidate sidecar cluster (#2436)#2466

Merged
brendancol merged 3 commits into
mainfrom
issue-2436-sidecar
May 27, 2026
Merged

geotiff tests: consolidate sidecar cluster (#2436)#2466
brendancol merged 3 commits into
mainfrom
issue-2436-sidecar

Conversation

@brendancol
Copy link
Copy Markdown
Contributor

Closes #2436 (Sub-PR A of two). Cluster 12 of the long-tail GeoTIFF test consolidation epic (#2424). Tests-only.

Summary

Merges six top-level sidecar files into a new xrspatial/geotiff/tests/integration/test_sidecar.py, one Section per source issue:

  • test_sidecar_ovr_2112.py
  • test_sidecar_own_geokeys_2315.py
  • test_sidecar_max_cloud_bytes_2121.py
  • test_sidecar_bad_does_not_break_base_2416.py
  • test_remote_sidecar_chunked_2239.py
  • test_remote_sidecar_byte_order_2314.py

Module helpers that collided across sources are namespaced per source issue, and GPU gating moves to the shared requires_gpu marker from _helpers/markers.py. The bundled golden_corpus fixture path now resolves against the tests directory since the file sits one level deeper in integration/. No assertion changed; 64 test functions (83 collected) match the pre-consolidation total.

test_gpu_sidecar_georef_parity_2324.py imported _write_pair from the own-geokeys file, so that import now points at the consolidated module. The release-gate checklist (release_gate_geotiff.rst) and the geotiff docs cite the new path so the checklist-parity gate stays green.

Audit

CLUSTER_AUDIT_SIDECAR.md maps every old file::test to its new home. It is deleted on a final commit before merge per the epic hard gate.

Verification

  • pytest xrspatial/geotiff/tests/integration/test_sidecar.py xrspatial/geotiff/tests/test_gpu_sidecar_georef_parity_2324.py -q: 86 passed.
  • pytest xrspatial/geotiff/tests/ --co -q: 5890 tests collected.

Test plan

  • New integration/test_sidecar.py passes on this checkout.
  • Full geotiff suite collects.
  • CI green across numpy / cupy / dask+numpy / dask+cupy.
  • Audit file deleted on the pre-merge commit.

Fold the six top-level sidecar files into a new
integration/test_sidecar.py, one Section per source issue:

- test_sidecar_ovr_2112.py
- test_sidecar_own_geokeys_2315.py
- test_sidecar_max_cloud_bytes_2121.py
- test_sidecar_bad_does_not_break_base_2416.py
- test_remote_sidecar_chunked_2239.py
- test_remote_sidecar_byte_order_2314.py

Colliding module helpers are namespaced per source issue and GPU gating
moves to the shared requires_gpu marker. The golden_corpus fixture path
resolves against the tests directory now that the file lives one level
deeper. No assertion changed; 64 test functions (83 collected) match the
pre-consolidation total.

test_gpu_sidecar_georef_parity_2324.py imported _write_pair from the
own-geokeys file; the import now points at the consolidated module. The
release-gate checklist and geotiff docs cite the new path so the
checklist-parity gate stays green.

Sub-PR A of issue #2436 (cluster 12, long-tail epic #2424). Tests-only.
@github-actions github-actions Bot added the performance PR touches performance-sensitive code label May 26, 2026
@brendancol brendancol merged commit 23e7a46 into main May 27, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

performance PR touches performance-sensitive code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Consolidation cluster 12: sidecar and remote hardening (long-tail epic #2424)

1 participant