Skip to content

Commit

Permalink
Merge pull request moby#47475 from thaJeztah/nothing_to_see_here_move…
Browse files Browse the repository at this point in the history
…_along_move_along

distribution/xfer: fix pull progress message
  • Loading branch information
vvoland authored Feb 29, 2024
2 parents a242208 + ebf3f8c commit d19d98b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion distribution/xfer/download.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
4 changes: 2 additions & 2 deletions distribution/xfer/download_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit d19d98b

Please sign in to comment.