-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Convert test_custom grains test to pytest and fix integration tests fileserver issue #67164
Merged
dwoz
merged 2 commits into
saltstack:3006.x
from
barneysowood:67140-windows-test-failures-integration-1
Jan 17, 2025
Merged
Convert test_custom grains test to pytest and fix integration tests fileserver issue #67164
dwoz
merged 2 commits into
saltstack:3006.x
from
barneysowood:67140-windows-test-failures-integration-1
Jan 17, 2025
Conversation
This file contains 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
barneysowood
force-pushed
the
67140-windows-test-failures-integration-1
branch
from
January 17, 2025 15:35
3385b14
to
40175fe
Compare
barneysowood
force-pushed
the
67140-windows-test-failures-integration-1
branch
from
January 17, 2025 20:07
05eb58a
to
bb54814
Compare
Converts the test_custom grains test from an old style test to a pytest test. This is just to make it easier for me to debug why it is failing and needs to be done at some point anyway.
Updates salt_factories_default_root_dir to use $RUNNER_TEMP if running in CI and using Windows. This is setup by the Github Runner and should be on the same disk as the checked out repo. Without doing that, the salt_factories_default_root_dir will be in the user's temp dir which is on a different disk. This causes the fileserver to throw an error as it tries to combine file_roots from the repo and pytest-salt-factories.
barneysowood
force-pushed
the
67140-windows-test-failures-integration-1
branch
from
January 17, 2025 21:13
bb54814
to
e1c9c1f
Compare
barneysowood
changed the title
Convert test_custom grains test to pytest
Convert test_custom grains test to pytest and fix integration tests fileserver issue
Jan 17, 2025
dwoz
approved these changes
Jan 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
What issues does this PR fix or reference?
Converts the test_custom grains test from an old style test to a pytest test. This is just to make it easier for me to debug why it is failing and needs to be done at some point anyway.
Fixes issue where integration tests were failing on Windows due to
tests/integration/files/file/base
not being available via the fileserver. See [TEST FAILURE] Various Windows tests failing in CI #67140 (comment) for a full explanation.Previous Behavior
New Behavior