mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-07-30 18:23:29 +03:00
Code Activity

Merge pull request #40595 from sfzhu93/GL_2_25

Browse Source 
[integration] add buffer to prevent goroutine leak
This commit is contained in:
Sebastiaan van Stijn
2020-05-08 16:00:52 +02:00
committed by GitHub
parent e184eac73a c322af8019
commit 0fc914de5c
22 changed files with 63 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
integration-cli/docker_cli_daemon_test.go
View File

@ -1246,7 +1246,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartKillWait(c *testing.T) {
s.d.Restart(c)
errchan := make(chan error)
errchan := make(chan error, 1)
go func() {
if out, err := s.d.Cmd("wait", containerID); err != nil {
errchan <- fmt.Errorf("%v:\n%s", err, out)
@ -1599,15 +1599,17 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPausedContainer(c *testing.T) {
}
s.d.Restart(c)
errchan := make(chan error)
errchan := make(chan error, 1)
go func() {
out, err := s.d.Cmd("start", "test")
if err != nil {
errchan <- fmt.Errorf("%v:\n%s", err, out)
return
}
name := strings.TrimSpace(out)
if name != "test" {
errchan <- fmt.Errorf("Paused container start error on docker daemon restart, expected 'test' but got '%s'", name)
return
}
close(errchan)
}()