浏览代码

Merge pull request #42155 from Snorch/integration-cli-fix-race-in-TestServiceLogsFollow

integration-cli: Fix race in TestServiceLogsFollow test case
Brian Goff 3 年之前
父节点
当前提交
54fc2812e0
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      integration-cli/docker_cli_service_logs_test.go

+ 2 - 0
integration-cli/docker_cli_service_logs_test.go

@@ -170,6 +170,8 @@ func (s *DockerSwarmSuite) TestServiceLogsFollow(c *testing.T) {
 	args := []string{"service", "logs", "-f", name}
 	args := []string{"service", "logs", "-f", name}
 	cmd := exec.Command(dockerBinary, d.PrependHostArg(args)...)
 	cmd := exec.Command(dockerBinary, d.PrependHostArg(args)...)
 	r, w := io.Pipe()
 	r, w := io.Pipe()
+	defer r.Close()
+	defer w.Close()
 	cmd.Stdout = w
 	cmd.Stdout = w
 	cmd.Stderr = w
 	cmd.Stderr = w
 	assert.NilError(c, cmd.Start())
 	assert.NilError(c, cmd.Start())