Remove template test xfails and enforce regressions as hard assertions - #1648
Merged
Merged
Conversation
This was referenced Mar 4, 2026
retlehs
marked this pull request as ready for review
March 5, 2026 04:47
Align test with #1642 which replaced the boolean nginx_cache_use_stale_updating with a full-value nginx_cache_use_stale variable. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Converts template regression tests from
xfail(strict=True)to normal hard assertions.These tests were intentionally marked
xfailuntil the underlying fixes landed. This PR enforces them as standard pass/fail checks.Warning
This draft PR is expected to fail CI until #1640, #1641, and #1642 are merged.
It intentionally removes
xfail(strict=True)so currently-known regressions fail hard.Do not merge until those three PRs are merged and this branch is rebased onto
master.Refs #1643.
Why now
Current
masterCI is green because these are expected failures, not because the regressions are fixed in tests yet.From CI run
22684086685:XFAIL tests/templates/test_nginx_conf.py::test_cache_use_stale_excludes_updating_by_default - #1551XFAIL tests/templates/test_wordpress_site_conf.py::test_cache_directives_scope_to_200_and_skip_location_responses - #1594XFAIL tests/templates/test_wordpress_site_conf.py::test_multisite_subdirectory_rewrite_uses_request_uri - #15484 passed, 3 xfailed in 0.73sRun link: https://github.com/roots/trellis/actions/runs/22684086685
Changes
xfail(strict=True)from:tests/templates/test_nginx_conf.py::test_cache_use_stale_excludes_updating_by_defaulttests/templates/test_wordpress_site_conf.py::test_cache_directives_scope_to_200_and_skip_location_responsestests/templates/test_wordpress_site_conf.py::test_multisite_subdirectory_rewrite_uses_request_uriValidation
Local run on this branch (no fix commits cherry-picked):
pytest -q -ra tests/templates->3 failed, 4 passed#1551,#1594,#1548Cherry-pick verification (temporary branch):
#1640(b42279c) and reranpytest -q -ra tests/templates2 failed, 5 passed#1548failure is resolved when the corresponding fix is presentMerge plan
master.