Merge pull request #47475 from thaJeztah/nothing_to_see_here_move_along_move_along

distribution/xfer: fix pull progress message

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())

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 {