Merge forward 3006.x into 3007.x #68447
Open
Conversation
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
As reported in saltstack#58210 and saltstack#57820, not all options get rendered in the final `interfaces` file. The valid_opts list must be a superset of the keys of the optmap map for the mappted options to get rendered. This commit adds the missing options to the valid_opts list.
Tests that all mapped options are also in valid_opts.
This prevents the generic error: _pygit2.GitError: error loading known_hosts: which is happening in certain pygit2/libgit2 versions
Migrate unittest style tests to pytest
Author: tcarroll25 saltstack#67931 (comment)
twangboy
requested changes
Nov 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
Merge forward.