-
Notifications
You must be signed in to change notification settings - Fork 884
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
tests: Fix wsl test file mocks, set defaults for optional os-release fields #5008
Conversation
Requesting review from @rvandegrift and @CarlosNihelton. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍🏽
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ship it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found a bug here with previous code. ds-identify should have been matching "${ID}-${VERSION_ID}.user-data"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @holmanb I added a diff suggestion unit test changes and a fallback to VERSION_CODENAME to help with debian /etc/os-release on trixie. let me know what you think
0687670
to
3e5c785
Compare
Looks good, that works for me! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
@holmanb thanks, works for me |
Thanks for the reviews @rvandegrift @blackboxsw @CarlosNihelton! |
Force ds-identify to use the correct file mocks Set defaults for optional os-release fields [1] VERSION_ID and ID might not be set; set defaults. [1] man 5 os-release Fixes canonicalGH-5002
Force ds-identify to use the correct file mocks Set defaults for optional os-release fields [1] VERSION_ID and ID might not be set; set defaults. [1] man 5 os-release Fixes canonicalGH-5002
Force ds-identify to use the correct file mocks Set defaults for optional os-release fields [1] VERSION_ID and ID might not be set; set defaults. [1] man 5 os-release Fixes canonicalGH-5002
Force ds-identify to use the correct file mocks Set defaults for optional os-release fields [1] VERSION_ID and ID might not be set; set defaults. [1] man 5 os-release Fixes canonicalGH-5002
Force ds-identify to use the correct file mocks Set defaults for optional os-release fields [1] VERSION_ID and ID might not be set; set defaults. [1] man 5 os-release Fixes GH-5002
Force ds-identify to use the correct file mocks Set defaults for optional os-release fields [1] VERSION_ID and ID might not be set; set defaults. [1] man 5 os-release Fixes canonicalGH-5002
Force ds-identify to use the correct file mocks Set defaults for optional os-release fields [1] VERSION_ID and ID might not be set; set defaults. [1] man 5 os-release Fixes GH-5002
Proposed Commit Message
Additional Context
Fixes GH-5002
Test Steps
Comment out
VERSION_ID
in the host system's os-release file, runMerge type