Merge pull request #22941 from AkihiroSuda/fix22940

Fix a race in cmd/dockerd/hack.TestHeaderOverrideHack
Upstream-commit: f10a222de1cc756bb14d157b778d820fac3561aa
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2016-05-24 18:13:44 +02:00
@@ -38,9 +38,9 @@ func TestHeaderOverrideHack(t *testing.T) {
read := make([]byte, 4096)
for _, pair := range tests {
go func() {
srv.Write(pair[0])
}()
go func(x []byte) {
srv.Write(x)
}(pair[0])
n, err := l.Read(read)
if err != nil && err != io.EOF {
t.Fatalf("read: %d - %d, err: %v\n%s", n, len(pair[0]), err, string(read[:n]))