From ebf3f8c7fe100253c19e3781ff8c4c6d2adfbfb8 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 29 Feb 2024 14:02:55 +0100 Subject: [PATCH] distribution/xfer: fix pull progress message This message accidentally changed in ac2a028dcc05532109e14f8af105ca42c0abf1f3 because my IDE's "refactor tool" was a bit over-enthusiastic. It also went and updated the tests accordingly, so CI didn't catch this :) Signed-off-by: Sebastiaan van Stijn --- distribution/xfer/download.go | 2 +- distribution/xfer/download_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/distribution/xfer/download.go b/distribution/xfer/download.go index 4839134188..1f8d7c10a7 100644 --- a/distribution/xfer/download.go +++ b/distribution/xfer/download.go @@ -364,7 +364,7 @@ func (ldm *LayerDownloadManager) makeDownloadFunc(descriptor DownloadDescriptor, return } - progress.Update(progressOutput, descriptor.ID(), "PullOptions complete") + progress.Update(progressOutput, descriptor.ID(), "Pull complete") if withRegistered, ok := descriptor.(DigestRegisterer); ok { withRegistered.Registered(d.layer.DiffID()) diff --git a/distribution/xfer/download_test.go b/distribution/xfer/download_test.go index f6e6e3f8b7..ca48388977 100644 --- a/distribution/xfer/download_test.go +++ b/distribution/xfer/download_test.go @@ -316,8 +316,8 @@ func TestSuccessfulDownload(t *testing.T) { if receivedProgress[d.ID()].Action != "Already exists" { t.Fatalf("did not get 'Already exists' message for %v", d.ID()) } - } else if receivedProgress[d.ID()].Action != "PullOptions complete" { - t.Fatalf("did not get 'PullOptions complete' message for %v", d.ID()) + } else if receivedProgress[d.ID()].Action != "Pull complete" { + t.Fatalf("did not get 'Pull complete' message for %v", d.ID()) } if rootFS.DiffIDs[i] != descriptor.expectedDiffID {