Merge pull request moby#40157 from lzhfromustc/GL_2test

awslogs & archive: prevent 2 goroutine leaks in test functions
docker · Oct 31, 2019 · 64fd3dc · 64fd3dc
2 parents 9232e10 + d7bc994
commit 64fd3dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/daemon/logger/awslogs/cloudwatchlogs_test.go b/daemon/logger/awslogs/cloudwatchlogs_test.go
@@ -345,7 +345,7 @@ func TestLogNonBlockingBufferFull(t *testing.T) {
 		logNonBlocking: true,
 	}
 	stream.messages <- &logger.Message{}
-	errorCh := make(chan error)
+	errorCh := make(chan error, 1)
 	started := make(chan bool)
 	go func() {
 		started <- true

diff --git a/pkg/archive/archive_test.go b/pkg/archive/archive_test.go
@@ -217,7 +217,7 @@ func TestCmdStreamLargeStderr(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to start command: %s", err)
 	}
-	errCh := make(chan error)
+	errCh := make(chan error, 1)
 	go func() {
 		_, err := io.Copy(ioutil.Discard, out)
 		errCh <- err