tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 07:34:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

make e2e TestKillChildOnCancel exec properly on windows

Browse Source
This commit is contained in:
guillaume.tardif 2020-06-04 16:31:06 +02:00 committed by Guillaume Tardif
parent 427527d197
commit 7c6b04f28e
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/e2e/e2e_test.go
View File

@ -109,7 +109,7 @@ func (s *E2eSuite) TestSetupError() {
func (s *E2eSuite) TestKillChildOnCancel() { func (s *E2eSuite) TestKillChildOnCancel() {
It("should kill docker-classic if parent command is cancelled", func() { It("should kill docker-classic if parent command is cancelled", func() {
out := s.NewCommand("ps", "-x").ExecOrDie() out := s.ListProcessesCommand().ExecOrDie()
Expect(out).NotTo(ContainSubstring("docker-classic")) Expect(out).NotTo(ContainSubstring("docker-classic"))
dir := s.ConfigDir dir := s.ConfigDir
@ -122,16 +122,16 @@ RUN sleep 100`), 0644)).To(Succeed())
_, err := ctx.Exec() _, err := ctx.Exec()
errs <- err errs <- err
}() }()
err := WaitFor(time.Second, 3*time.Second, errs, func() bool { err := WaitFor(time.Second, 10*time.Second, errs, func() bool {
out := s.NewCommand("ps", "-x").ExecOrDie() out := s.ListProcessesCommand().ExecOrDie()
return strings.Contains(out, "docker-classic") return strings.Contains(out, "docker-classic")
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
log.Println("Killing docker process") log.Println("Killing docker process")
close(shutdown) close(shutdown)
err = WaitFor(time.Second, 4*time.Second, nil, func() bool { err = WaitFor(time.Second, 12*time.Second, nil, func() bool {
out := s.NewCommand("ps", "-x").ExecOrDie() out := s.ListProcessesCommand().ExecOrDie()
return !strings.Contains(out, "docker-classic") return !strings.Contains(out, "docker-classic")
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

10
tests/framework/exec.go
View File

@ -32,6 +32,7 @@ import (
"fmt" "fmt"
"io" "io"
"os/exec" "os/exec"
"runtime"
"strings" "strings"
"syscall" "syscall"
"time" "time"
@ -176,7 +177,7 @@ func Execute(cmd *exec.Cmd, timeout <-chan time.Time) (string, error) {
} }
case <-timeout: case <-timeout:
log.Debugf("%s %s timed-out", cmd.Path, strings.Join(cmd.Args[1:], " ")) log.Debugf("%s %s timed-out", cmd.Path, strings.Join(cmd.Args[1:], " "))
if err := cmd.Process.Signal(syscall.SIGTERM); err != nil { if err := terminateProcess(cmd); err != nil {
return "", err return "", err
} }
return "", fmt.Errorf( return "", fmt.Errorf(
@ -189,6 +190,13 @@ func Execute(cmd *exec.Cmd, timeout <-chan time.Time) (string, error) {
return stdout.String(), nil return stdout.String(), nil
} }
func terminateProcess(cmd *exec.Cmd) error {
if runtime.GOOS == "windows" {
return cmd.Process.Kill()
}
return cmd.Process.Signal(syscall.SIGTERM)
}
func mergeWriter(other io.Writer, buf io.Writer) io.Writer { func mergeWriter(other io.Writer, buf io.Writer) io.Writer {
if other != nil { if other != nil {
return io.MultiWriter(other, buf) return io.MultiWriter(other, buf)

8
tests/framework/suite.go
View File

@ -107,6 +107,14 @@ func (s *Suite) AfterTest(suite, test string) {
_ = os.RemoveAll(s.ConfigDir) _ = os.RemoveAll(s.ConfigDir)
} }
// ListProcessesCommand creates a command to list processes, "tasklist" on windows, "ps" otherwise.
func (s *Suite) ListProcessesCommand() *CmdContext {
if runtime.GOOS == "windows" {
return s.NewCommand("tasklist")
}
return s.NewCommand("ps")
}
// NewCommand creates a command context. // NewCommand creates a command context.
func (s *Suite) NewCommand(command string, args ...string) *CmdContext { func (s *Suite) NewCommand(command string, args ...string) *CmdContext {
return &CmdContext{ return &CmdContext{