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

Fix events test flakiness.

Browse source 
Since channel is getting a send instead of a close now, this can cause
random issues ranging through the list of channels if the channel is
unbuffered since the send may be blocked.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2016-02-18 16:10:29 -05:00
parent 038c3b8287
commit abbf2aa6dd
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
integration-cli/docker_cli_authz_unix_test.go
View file

@ -265,8 +265,8 @@ func (s *DockerAuthzSuite) TestAuthZPluginAllowEventStream(c *check.C) {
c.Assert(s.d.waitRun(containerID), checker.IsNil) c.Assert(s.d.waitRun(containerID), checker.IsNil)
events := map[string]chan bool{ events := map[string]chan bool{
"create": make(chan bool), "create": make(chan bool, 1),
"start": make(chan bool), "start": make(chan bool, 1),
} }
matcher := matchEventLine(containerID, "container", events) matcher := matchEventLine(containerID, "container", events)
@ -277,7 +277,7 @@ func (s *DockerAuthzSuite) TestAuthZPluginAllowEventStream(c *check.C) {
for event, eventChannel := range events { for event, eventChannel := range events {
select { select {
case <-time.After(5 * time.Second): case <-time.After(30 * time.Second):
// Fail the test // Fail the test
observer.CheckEventError(c, containerID, event, matcher) observer.CheckEventError(c, containerID, event, matcher)
c.FailNow() c.FailNow()

4
integration-cli/docker_cli_build_unix_test.go
View file

@ -171,8 +171,8 @@ func (s *DockerSuite) TestBuildCancellationKillsSleep(c *check.C) {
} }
testActions := map[string]chan bool{ testActions := map[string]chan bool{
"start": make(chan bool), "start": make(chan bool, 1),
"die": make(chan bool), "die": make(chan bool, 1),
} }
matcher := matchEventLine(buildID, "container", testActions) matcher := matchEventLine(buildID, "container", testActions)

12
integration-cli/docker_cli_events_unix_test.go
View file

@ -232,10 +232,10 @@ func (s *DockerSuite) TestEventsStreaming(c *check.C) {
containerID := strings.TrimSpace(out) containerID := strings.TrimSpace(out)
testActions := map[string]chan bool{ testActions := map[string]chan bool{
"create": make(chan bool), "create": make(chan bool, 1),
"start": make(chan bool), "start": make(chan bool, 1),
"die": make(chan bool), "die": make(chan bool, 1),
"destroy": make(chan bool), "destroy": make(chan bool, 1),
} }
matcher := matchEventLine(containerID, "container", testActions) matcher := matchEventLine(containerID, "container", testActions)
@ -291,8 +291,8 @@ func (s *DockerSuite) TestEventsImageUntagDelete(c *check.C) {
c.Assert(deleteImages(name), checker.IsNil) c.Assert(deleteImages(name), checker.IsNil)
testActions := map[string]chan bool{ testActions := map[string]chan bool{
"untag": make(chan bool), "untag": make(chan bool, 1),
"delete": make(chan bool), "delete": make(chan bool, 1),
} }
matcher := matchEventLine(imageID, "image", testActions) matcher := matchEventLine(imageID, "image", testActions)