Merge pull request #4818 from haytok/issue_4789

test: resolve a flaky test of TestLoadStdinFromPipe

Author: AkihiroSuda

cmd/nerdctl/image/image_load_test.go

@@ -38,7 +38,7 @@ func TestLoadStdinFromPipe(t *testing.T) {
 
 	testCase := &test.Case{
 		Description: "TestLoadStdinFromPipe",
-		Require:     require.All(require.Linux, nerdtest.IsFlaky("https://github.com/containerd/nerdctl/issues/4789")),
+		Require:     require.Linux,
 		Setup: func(data test.Data, helpers test.Helpers) {
 			identifier := data.Identifier()
 			helpers.Ensure("pull", "--quiet", testutil.CommonImage)

pkg/imgutil/load/load.go

@@ -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, ""),
@@ -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
 }