gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-22 07:10:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

test: fix flaky TestDockerEngine (#6054)

Browse Source
This commit is contained in:
DmitriyLewen
2024-02-02 14:48:51 +06:00
committed by GitHub
parent c3a66da9c3
commit 27d35baa4a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
integration/docker_engine_test.go
View File

@@ -245,7 +245,10 @@ func TestDockerEngine(t *testing.T) {
// load image into docker engine // load image into docker engine
res, err := cli.ImageLoad(ctx, testfile, true) res, err := cli.ImageLoad(ctx, testfile, true)
require.NoError(t, err, tt.name) require.NoError(t, err, tt.name)
io.Copy(io.Discard, res.Body) if _, err := io.Copy(io.Discard, res.Body); err != nil {
require.NoError(t, err, tt.name)
}
defer res.Body.Close()
// tag our image to something unique // tag our image to something unique
err = cli.ImageTag(ctx, tt.imageTag, tt.input) err = cli.ImageTag(ctx, tt.imageTag, tt.input)
@@ -253,15 +256,14 @@ func TestDockerEngine(t *testing.T) {
// cleanup // cleanup
t.Cleanup(func() { t.Cleanup(func() {
_, err = cli.ImageRemove(ctx, tt.input, api.ImageRemoveOptions{ _, _ = cli.ImageRemove(ctx, tt.input, api.ImageRemoveOptions{
Force: true, Force: true,
PruneChildren: true, PruneChildren: true,
}) })
_, err = cli.ImageRemove(ctx, tt.imageTag, api.ImageRemoveOptions{ _, _ = cli.ImageRemove(ctx, tt.imageTag, api.ImageRemoveOptions{
Force: true, Force: true,
PruneChildren: true, PruneChildren: true,
}) })
assert.NoError(t, err, tt.name)
}) })
} }