0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4357 from creack/fix_TestCmdKill

Browse source 
Fix TestCmdKill by closing the pipe before waiting on the container
This commit is contained in:
Victor Vieux 2014-02-26 12:20:30 -08:00
commit 5908aa350d
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
integration/commands_test.go
View file

@ -1046,11 +1046,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{})
@ -1089,6 +1090,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")