From 82b67c421a2782d225068053a7e556d776a0904e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 18 Aug 2025 19:46:36 +0200 Subject: [PATCH] internal/jsonstream: TestDisplay use streamformatter Similar to 69854c4e08c502f57a1fed4ec58236fae229db37, but for the internal/jsonstream package. Signed-off-by: Sebastiaan van Stijn --- internal/jsonstream/display_test.go | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/internal/jsonstream/display_test.go b/internal/jsonstream/display_test.go index 221413721958..a12b19411402 100644 --- a/internal/jsonstream/display_test.go +++ b/internal/jsonstream/display_test.go @@ -2,14 +2,14 @@ package jsonstream import ( "context" - "encoding/json" - "fmt" "io" "testing" "time" "github.com/docker/cli/cli/streams" - "github.com/moby/moby/api/types/jsonstream" + "github.com/docker/cli/internal/test" + "github.com/moby/moby/api/pkg/progress" + "github.com/moby/moby/api/pkg/streamformatter" "gotest.tools/v3/assert" ) @@ -23,25 +23,19 @@ func TestDisplay(t *testing.T) { }) go func() { - enc := json.NewEncoder(server) + id := test.RandomID()[:12] // short-ID + progressOutput := streamformatter.NewJSONProgressOutput(server, true) for i := 0; i < 100; i++ { select { case <-ctx.Done(): assert.NilError(t, server.Close(), "failed to close jsonmessage server") return default: - err := enc.Encode(JSONMessage{ - Status: "Downloading", - ID: fmt.Sprintf("id-%d", i), - TimeNano: time.Now().UnixNano(), - Time: time.Now().Unix(), - Progress: &JSONProgress{ - Progress: jsonstream.Progress{ - Current: int64(i), - Total: 100, - Start: 0, - }, - }, + err := progressOutput.WriteProgress(progress.Progress{ + ID: id, + Message: "Downloading", + Current: int64(i), + Total: 100, }) if err != nil { break