mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-12-03 07:41:01 +03:00
Code Activity

Fix channel closing race in event tests.

Browse Source 
Divide event matching into two functions, a matcher and
a processor. That way, the error handling doesn't call
the channel closing logic at all.

Signed-off-by: David Calavera <david.calavera@gmail.com>
This commit is contained in:
David Calavera
2016-01-20 17:36:39 -05:00
parent 2705fa573b
commit 27b060492c
3 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
integration-cli/docker_cli_events_unix_test.go
View File

@@ -224,7 +224,8 @@ func (s *DockerSuite) TestEventsStreaming(c *check.C) {
}
matcher := matchEventLine(containerID, "container", testActions)
go observer.Match(matcher)
processor := processEventMatch(testActions)
go observer.Match(matcher, processor)
select {
case <-time.After(5 * time.Second):
@@ -280,7 +281,8 @@ func (s *DockerSuite) TestEventsImageUntagDelete(c *check.C) {
}
matcher := matchEventLine(imageID, "image", testActions)
go observer.Match(matcher)
processor := processEventMatch(testActions)
go observer.Match(matcher, processor)
select {
case <-time.After(10 * time.Second):