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

Require ordering of relationships when comparing parser output #2160

Merged
merged 3 commits into from
Sep 20, 2023

Conversation

wagoodman
Copy link
Contributor

There were two problems found:

  • relationships were not being sorted during test assertions, leading to unstable results
  • IDs were not being set on packages for conan tests (which will affect the new sorting)

I also added an additional entry to the gitignore for a case that goland keeps generating (erroneously).

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
@wagoodman wagoodman added the changelog-ignore Don't include this issue in the release changelog label Sep 20, 2023
@wagoodman wagoodman requested a review from a team September 20, 2023 14:50
@wagoodman wagoodman self-assigned this Sep 20, 2023
@wagoodman wagoodman enabled auto-merge (squash) September 20, 2023 14:51
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
@wagoodman wagoodman force-pushed the fix-conan-test-relationship-order branch from be68df8 to 89846cd Compare September 20, 2023 17:29
@@ -30,6 +30,7 @@ VERSION
/test/results
coverage.txt
*.log
test/integration/test-fixtures/**/go.sum
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I keep running into goland generating go.sums for these and we don't want them in the codebase

@wagoodman wagoodman enabled auto-merge (squash) September 20, 2023 17:30
@wagoodman wagoodman merged commit 58f8c85 into main Sep 20, 2023
9 checks passed
@wagoodman wagoodman deleted the fix-conan-test-relationship-order branch September 20, 2023 17:39
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
…re#2160)

* require ordering of relationships when comparing parser output

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

* [wip] fix cataloger test

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

* change method of relationship sort to simple string dump

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

---------

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-ignore Don't include this issue in the release changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants