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.

Sign up for GitHub

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

Jump to bottom

test: fix flaky TestDockerEngine #6054

Merged
merged 2 commits into from
Feb 2, 2024
Merged

test: fix flaky TestDockerEngine #6054

merged 2 commits into from
Feb 2, 2024

Conversation

DmitriyLewen
Copy link
Contributor

Description

We need to close ImageLoad response to avoid a resource leak - https://github.com/moby/moby/blob/71fa3ab079ec13d17257f86fa92db8d7f24802f1/api/types/client.go#L198
We get flaky errors when try to remove image after finish each TestDockerEngine testcase:
https://github.com/aquasecurity/trivy/actions/runs/7743024958/job/21113470515?pr=6047#step:5:652
Looks like we don't need to check this error.

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

@DmitriyLewen DmitriyLewen self-assigned this Feb 2, 2024
@DmitriyLewen DmitriyLewen changed the title test: close ImageLoad response, don't check for error when Cleanup test: fix flaky TestDockerEngine Feb 2, 2024
@DmitriyLewen DmitriyLewen marked this pull request as ready for review February 2, 2024 08:43
@knqyf263 knqyf263 added this pull request to the merge queue Feb 2, 2024
@knqyf263
Copy link
Collaborator

knqyf263 commented Feb 2, 2024

I was about to ask you to look into this problem, but you already did it 👍

Merged via the queue into aquasecurity:main with commit 27d35ba Feb 2, 2024
13 checks passed
@DmitriyLewen DmitriyLewen deleted the test/fix-docker-engine-fluky-tests branch February 2, 2024 09:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@knqyf263 knqyf263 knqyf263 approved these changes

Assignees

@DmitriyLewen DmitriyLewen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DmitriyLewen @knqyf263