Skip to content

Rewrite pyramid tests - #6471

Merged
pwalczysko merged 4 commits into
ome:developfrom
pwalczysko:pyramids-proper
Aug 3, 2026
Merged

Rewrite pyramid tests#6471
pwalczysko merged 4 commits into
ome:developfrom
pwalczysko:pyramids-proper

Conversation

@pwalczysko

@pwalczysko pwalczysko commented Jul 27, 2026

Copy link
Copy Markdown
Member

What this PR does

Rewrites pyramid tests in the OmeroPy suite contained inside pytest test/integration/clitest/test_pyramids.py .
As these tests are operating strictly on OMERO-pyramids (under /OMERO/Pixels) and not on pyramids which are part of the imported file, the strategy taken here had to be to skip the tests with clarification, see comment of @sbesson #6471 (comment)

This PR:

  • Reverts the PR Fix test_pyramids.py little and big_endian #6464 which was merged already and which used polling tactics to force the tests passing
  • Skips the pure pyramid tests using the @pytest.mark.skipif
  • Adds comments to test classes explaining the character of the tested admin removepyramids cmd which is operating on OMERO pyramids only
  • Renames the tests to test_omero_pyramids.py to make the situation obvious

Testing this PR

Check if the tests in the OmeroPy suite contained inside pytest test/integration/clitest/test_pyramids.py either pass or are skipped.

Related reading

Note this is related to #6470

@pwalczysko

Copy link
Copy Markdown
Member Author

This needs a total rethink. The replacement of the single-plane-fake file import with an import of a fake file with pyramids included has grave consequences on the whole philosophy of this test suite, which is mainly testing the CLI command removepyramids https://github.com/ome/omero-py/blob/5d0974d097e25d98892b9b419528edf9256274b0/src/omero/util/cleanse.py#L383. This cmd is relying for its basic functioning on pyramid files being present under /OMERO/Pixels. Such omero-pyramids are not present when I import a fake file with pyramids included. My attempts up till now to fix the tests were nonsensical, as one cannot delete "undeletable" pyramids which are a part of the image file itself.

Atm, the only reasonable approach seems to be skipping the failing tests here.

cc @sbesson

@sbesson

sbesson commented Jul 31, 2026

Copy link
Copy Markdown
Member

Agreed, this is an example of tests which specifically test and depend on OMERO pyramids. I think skipping them (conditionally to either the configuration or environment) is the best course of action.

An additional clarification idea would be to rename the tests e.g. as test_omero_pyramids and add some comments clarifying their scope.

@pwalczysko
pwalczysko force-pushed the pyramids-proper branch 2 times, most recently from 6335ed7 to 6c842aa Compare July 31, 2026 16:17
@pwalczysko pwalczysko closed this Jul 31, 2026
@pwalczysko pwalczysko reopened this Jul 31, 2026
@pwalczysko

Copy link
Copy Markdown
Member Author

Agreed, this is an example of tests which specifically test and depend on OMERO pyramids. I think skipping them (conditionally to either the configuration or environment) is the best course of action.

An additional clarification idea would be to rename the tests e.g. as test_omero_pyramids and add some comments clarifying their scope.

Thank you @sbesson . Fixes pushed accordingly see the 4 commits above. Also edited the header of this PR to make the situation clear and adding the Include to confirm on Jenkins.

@pwalczysko

pwalczysko commented Aug 1, 2026

Copy link
Copy Markdown
Member Author

The build https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-test-integration/lastCompletedBuild/ is not having any failures from the tests in this PR, all pass or skipped as expected.

Screenshot 2026-08-01 at 21 43 02

@pwalczysko
pwalczysko merged commit 1dc039c into ome:develop Aug 3, 2026
4 checks passed
@pwalczysko
pwalczysko deleted the pyramids-proper branch August 3, 2026 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants