Support macOS 11.0 and 11 builds; Update tests #503
Merged
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
- refresh the mock data from artifactory - added helper to easily refresh data going forward - update tests with accurate versions (e.g., versions may no longer exist in the current channel) - Add helper logic to avoid having to manually update a bunch of spec tests - Use `mixlib/install` to fetch latest version data rather than hard-coding it Signed-off-by: Tom Duffield <tom@chef.io>
Signed-off-by: Tom Duffield <tom@chef.io>
Updates our comparison logic to handle the situation caused by having both 11 and 11.0 builds. If we're comparing two versions, and one has a minor/patch while the other does not, simply stop comparing and use the last known comparsion. Signed-off-by: Tom Duffield <tom@chef.io>
Signed-off-by: Tom Duffield <tom@chef.io>
tduffield
force-pushed
the
macos-major-minor-support
branch
from
998ece7
to
4ab3e8d
Compare
lib/platform_dsl.rb
Outdated
| ret = favor_integer_sorting(self.mapped_minor, otherVer.mapped_minor) if ret == 0 && self.mapped_minor | ||
| ret = favor_integer_sorting(self.mapped_patch, otherVer.mapped_patch) if ret == 0 && self.mapped_patch | ||
| if ret == 0 && self.mapped_minor | ||
| return ret if otherVer.mapped_minor.nil? |
There was a problem hiding this comment.
only question i've got here is if its deliberate that "11" also matches "11.2"? that does seem to work in my head due to yolo mode and partial version mappings, but its not quite called out in the tests that nil now means "match any minor number" rather than just matching zero (at least if I'm also reading the code correctly i suppose). probably worth a comment and/or a test at any rate.
There was a problem hiding this comment.
Sure. The intention is that it would support 11.2. I'll add some comments/tests to make that more explicit.
Signed-off-by: Tom Duffield <tom@chef.io>
Signed-off-by: Tom Duffield <tom@chef.io>
tduffield
force-pushed
the
macos-major-minor-support
branch
from
63b954f
to
06882e4
Compare
lamont-granquist
approved these changes
Feb 26, 2021
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.
Updates our comparison logic to handle the situation caused by having both 11 and 11.0 builds. If we're comparing two versions, and one has a minor/patch while the other does not, simply stop comparing and use the last known comparison.
This PR also updates the tests to pull in the latest data. As part of this I improved the fixture handling around our expectations to reduce the number of places we'd need to manually update strings when new data was brought in.
Closes #502
Signed-off-by: Tom Duffield tom@chef.io