kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Actually test the detach (was not the case before)

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-11-29 09:11:20 -08:00
parent 67e9e0e11b
commit 63d6cbe3e4
No known key found for this signature in database
GPG key ID: B33E4642CB6E3FF3
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
commands.go
View file

@ -2394,6 +2394,12 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea
if stdout != nil { if stdout != nil {
receiveStdout = utils.Go(func() (err error) { receiveStdout = utils.Go(func() (err error) {
defer func() {
if in != nil {
in.Close()
}
}()
// When TTY is ON, use regular copy // When TTY is ON, use regular copy
if setRawTerminal { if setRawTerminal {
_, err = io.Copy(stdout, br) _, err = io.Copy(stdout, br)

10
integration/commands_test.go
View file

@ -542,18 +542,18 @@ func TestAttachDetach(t *testing.T) {
}) })
setTimeout(t, "Escape sequence timeout", 5*time.Second, func() { setTimeout(t, "Escape sequence timeout", 5*time.Second, func() {
stdinPipe.Write([]byte{16, 17}) stdinPipe.Write([]byte{16})
if err := stdinPipe.Close(); err != nil { time.Sleep(100 * time.Millisecond)
t.Fatal(err) stdinPipe.Write([]byte{17})
}
}) })
closeWrap(stdin, stdinPipe, stdout, stdoutPipe)
// wait for CmdRun to return // wait for CmdRun to return
setTimeout(t, "Waiting for CmdAttach timed out", 15*time.Second, func() { setTimeout(t, "Waiting for CmdAttach timed out", 15*time.Second, func() {
<-ch <-ch
}) })
closeWrap(stdin, stdinPipe, stdout, stdoutPipe)
time.Sleep(500 * time.Millisecond) time.Sleep(500 * time.Millisecond)
if !container.State.IsRunning() { if !container.State.IsRunning() {
t.Fatal("The detached container should be still running") t.Fatal("The detached container should be still running")