test: replace mock with memory cache and fix non-deterministic tests #8410
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
This commit updates the local scanner tests to use a memory cache instead of mocking the applier. The changes include: - Removing mock applier files - Updating test cases to use `setupCache` function - Simplifying test setup and improving test readability - Adding package identifier details to test packages
This commit introduces sorting capabilities for various collections in the artifact details: - Added sort methods for Applications, Secrets, and LicenseFiles - Implemented a Sort() method for ArtifactDetail to consistently sort different collections - Updated types to support sorting based on specific criteria like type, file path, and package count
knqyf263
changed the title
Modify CycloneDX JSON test data: - Remove license entry for pom.xml - Add empty license text fields for Java package licenses - Reorder license entries in the JSON structure
Change the wantApps variable type from []types.Application to types.Applications to align with recent sorting and collection updates
pkg/scanner/local/scan_test.go
Outdated
| python39min, | ||
| { | ||
| FilePath: "usr/lib/python/site-packages/urllib3-3.2.1/METADATA", | ||
| Packages: []ftypes.Package{urllib3Pkg}, |
There was a problem hiding this comment.
Previous test included python39min:
trivy/pkg/scanner/local/scan_test.go
Line 316 in 3e503a0
Add this package here or remove this variable (because it is not used):
There was a problem hiding this comment.
it looks like this file doesn't have changes.
There was a problem hiding this comment.
ah, i understood how the new sorting affected.
Sorry for disturbing you
There was a problem hiding this comment.
No problem. Thanks for your comment. I've removed unneeded fields.
1f71820
Remove empty license text fields for package licenses in CycloneDX JSON test data
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.
Overview
This PR refactors scanner tests to use memory cache instead of mocks, which revealed the need for consistent sorting of artifact details.
Description
Scanner Test Refactoring
ApplyLayersArtifact Details Sorting (to fix non-deterministic tests)
To address the non-deterministic test results discovered during the refactoring, added sorting capabilities:
The addition of sorting was necessary because the previous mock-based tests were masking the undefined ordering of collections in the actual implementation.
Checklist