kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #19239 from aaronlehmann/fix-testsuccessfuldownload

Browse source 
Fix flaky test TestSuccessfulDownload
This commit is contained in:
Brian Goff 2016-01-11 14:09:14 -05:00
commit 0cdfd84aee
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
distribution/xfer/download_test.go
View file

@ -250,15 +250,11 @@ func TestSuccessfulDownload(t *testing.T) {
progressChan := make(chan progress.Progress) progressChan := make(chan progress.Progress)
progressDone := make(chan struct{}) progressDone := make(chan struct{})
receivedProgress := make(map[string]int64) receivedProgress := make(map[string]progress.Progress)
go func() { go func() {
for p := range progressChan { for p := range progressChan {
if p.Action == "Downloading" { receivedProgress[p.ID] = p
receivedProgress[p.ID] = p.Current
} else if p.Action == "Already exists" {
receivedProgress[p.ID] = -1
}
} }
close(progressDone) close(progressDone)
}() }()
@ -293,11 +289,11 @@ func TestSuccessfulDownload(t *testing.T) {
descriptor := d.(*mockDownloadDescriptor) descriptor := d.(*mockDownloadDescriptor)
if descriptor.diffID != "" { if descriptor.diffID != "" {
if receivedProgress[d.ID()] != -1 { if receivedProgress[d.ID()].Action != "Already exists" {
t.Fatalf("did not get 'already exists' message for %v", d.ID()) t.Fatalf("did not get 'Already exists' message for %v", d.ID())
} }
} else if receivedProgress[d.ID()] != 10 { } else if receivedProgress[d.ID()].Action != "Pull complete" {
t.Fatalf("missing or wrong progress output for %v (got: %d)", d.ID(), receivedProgress[d.ID()]) t.Fatalf("did not get 'Pull complete' message for %v", d.ID())
} }
if rootFS.DiffIDs[i] != descriptor.expectedDiffID { if rootFS.DiffIDs[i] != descriptor.expectedDiffID {