diff --git a/test/e2e/pkg/process/process.go b/test/e2e/pkg/process/process.go index ccff7ad0..dba006c1 100644 --- a/test/e2e/pkg/process/process.go +++ b/test/e2e/pkg/process/process.go @@ -3,7 +3,9 @@ package process import ( "bytes" "context" + "errors" "os/exec" + "sync" ) type Process struct { @@ -12,9 +14,11 @@ type Process struct { errorOutput *bytes.Buffer stdOutput *bytes.Buffer - done chan struct{} - waitErr error + done chan struct{} + closeOne sync.Once + waitErr error + started bool beforeStopHandler func() stopped bool } @@ -40,26 +44,35 @@ func NewWithEnvs(path string, params []string, envs []string) *Process { } func (p *Process) Start() error { + if p.started { + return errors.New("process already started") + } + p.started = true + err := p.cmd.Start() if err != nil { p.waitErr = err - close(p.done) + p.closeDone() return err } go func() { p.waitErr = p.cmd.Wait() - close(p.done) + p.closeDone() }() return nil } +func (p *Process) closeDone() { + p.closeOne.Do(func() { close(p.done) }) +} + // Done returns a channel that is closed when the process exits. func (p *Process) Done() <-chan struct{} { return p.done } func (p *Process) Stop() error { - if p.stopped { + if p.stopped || !p.started { return nil } defer func() {