Skip to content

test: resolve a flaky test of TestLoadStdinFromPipe #4818

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

Open
haytok wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −4
Open

test: resolve a flaky test of TestLoadStdinFromPipe #4818

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions pkg/imgutil/load/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ func FromArchive(ctx context.Context, client *containerd.Client, options types.I

var loadedImages []images.Image
pf, done := transferutil.ProgressHandler(ctx, options.Stdout)
defer done()

err = client.Transfer(ctx,
tarchive.NewImageImportStream(options.Stdin, ""),
Expand All @@ -96,16 +95,21 @@ func FromArchive(ctx context.Context, client *containerd.Client, options types.I
if img, err := imageService.Get(ctx, p.Name); err == nil {
if !beforeSet[img.Name] {
loadedImages = append(loadedImages, img)
if !options.Quiet {
fmt.Fprintf(options.Stdout, "Loaded image: %s\n", img.Name)
}
}
}
}
pf(p)
}),
)

done()

if !options.Quiet {
for _, img := range loadedImages {
fmt.Fprintf(options.Stdout, "Loaded image: %s\n", img.Name)
}
}

return loadedImages, err
}

Expand Down
Loading