Skip to content
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

Conversation

barneysowood
Copy link
Contributor

@barneysowood barneysowood commented Jan 16, 2025

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

  • custom grains integration test was failing
  • other integration tests didn't have required file in fileserver

New Behavior

  • custom grains test now working
  • files for integration tests now available

@barneysowood barneysowood force-pushed the 67140-windows-test-failures-integration-1 branch from 3385b14 to 40175fe Compare January 17, 2025 15:35
@barneysowood barneysowood force-pushed the 67140-windows-test-failures-integration-1 branch from 05eb58a to bb54814 Compare January 17, 2025 20:07
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 barneysowood force-pushed the 67140-windows-test-failures-integration-1 branch from bb54814 to e1c9c1f Compare January 17, 2025 21:13
@barneysowood 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
@barneysowood barneysowood marked this pull request as ready for review January 17, 2025 21:17
@barneysowood barneysowood requested a review from a team as a code owner January 17, 2025 21:17
@dwoz dwoz merged commit b0a0665 into saltstack:3006.x Jan 17, 2025
127 of 175 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants