conftest: split vm-type fixtures into require and skip variants - #579
Draft
d3athjest3r wants to merge 1 commit into
Draft
conftest: split vm-type fixtures into require and skip variants#579d3athjest3r wants to merge 1 commit into
d3athjest3r wants to merge 1 commit into
Conversation
unix_vm, windows_vm, and uefi_vm now call pytest.fail() if the VM is the wrong type, matching the expectation that these fixtures enforce a requirement. The new skip_if_not_unix_vm, skip_if_not_windows_vm, and skip_if_not_uefi_vm fixtures call pytest.skip() instead, for use in multi-VM jobs where different VMs types are expected and non-matching ones should be silently skipped rather than failed. So, updated all multi_vms-annotated classes to use the skip variants. The markable_fixtures list and jobs.py marker expressions are updated accordingly. Signed-off-by: Julian Vetter <julian.vetter@vates.tech>
d3athjest3r
force-pushed
the
replace_fixtures
branch
from
June 9, 2026 08:13
aec5c3d to
6c40003
Compare
casasnovas
requested changes
Jun 19, 2026
casasnovas
left a comment
casasnovas
left a comment
There was a problem hiding this comment.
The commit description is a bit misleading (or I'm missing something), in that the current unix_vm, windows_vm and uefi_vm actually skip the test and don't fail it - it's only after your change that they do fail the test. It does seem to imply that tests that were previously skipped will now fail (since you haven't changed all to use the new skip_if_not_* variant, is this intentional?
d3athjest3r
marked this pull request as draft
July 10, 2026 10:27
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
2 participants
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.
Opened new pull-request based on #410
Ping: @stormi
unix_vm, windows_vm, and uefi_vm now call pytest.fail() if the VM is the wrong type, matching the expectation that these fixtures enforce a requirement. The new skip_if_not_unix_vm, skip_if_not_windows_vm, and skip_if_not_uefi_vm fixtures call pytest.skip() instead, for use in multi-VM jobs where different VMs types are expected and non-matching ones should be silently skipped rather than failed. So, updated all multi_vms-annotated classes to use the skip variants. The markable_fixtures list and jobs.py marker expressions are updated accordingly.