From 4039fbb1b01365273e99a3cba28db33b38197237 Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Tue, 25 Feb 2014 20:16:17 -0800 Subject: [PATCH] Fix TestCmdKill by closing the pipe before waiting on the container Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes (github: creack) --- integration/commands_test.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/integration/commands_test.go b/integration/commands_test.go index a3359ec631..33117d8794 100644 --- a/integration/commands_test.go +++ b/integration/commands_test.go @@ -1043,11 +1043,12 @@ func TestContainerOrphaning(t *testing.T) { } func TestCmdKill(t *testing.T) { - stdin, stdinPipe := io.Pipe() - stdout, stdoutPipe := io.Pipe() - - cli := api.NewDockerCli(stdin, stdoutPipe, ioutil.Discard, testDaemonProto, testDaemonAddr) - cli2 := api.NewDockerCli(nil, ioutil.Discard, ioutil.Discard, testDaemonProto, testDaemonAddr) + var ( + stdin, stdinPipe = io.Pipe() + stdout, stdoutPipe = io.Pipe() + cli = api.NewDockerCli(stdin, stdoutPipe, ioutil.Discard, testDaemonProto, testDaemonAddr) + cli2 = api.NewDockerCli(nil, ioutil.Discard, ioutil.Discard, testDaemonProto, testDaemonAddr) + ) defer cleanup(globalEngine, t) ch := make(chan struct{}) @@ -1086,6 +1087,7 @@ func TestCmdKill(t *testing.T) { } }) + stdout.Close() time.Sleep(500 * time.Millisecond) if !container.State.IsRunning() { t.Fatal("The container should be still running")