Fix flaky test TestTransfer (take 2)

TestTransfer failed in CI:
https://jenkins.dockerproject.org/job/Docker-PRs-experimental/17103/console

This is the same issue as https://github.com/docker/docker/pull/21233,
but only one of the code paths was fixed in that PR. The one which
handles the first progress update was not - it still assumed that the
progress indication should be 0/10.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 0dea21f4462706290c85e6d74b165ceae7e9cfee
Component: engine
This commit is contained in:
Aaron Lehmann
2016-03-28 18:27:29 -07:00
parent c4d2d001a2
commit e439510d54

View File

@ -37,11 +37,7 @@ func TestTransfer(t *testing.T) {
go func() {
for p := range progressChan {
val, present := receivedProgress[p.ID]
if !present {
if p.Current != 0 {
t.Fatalf("got unexpected progress value: %d (expected 0)", p.Current)
}
} else if p.Current <= val {
if present && p.Current <= val {
t.Fatalf("got unexpected progress value: %d (expected %d)", p.Current, val+1)
}
receivedProgress[p.ID] = p.Current