extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-08-19 11:19:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

platformtest: dedicated pool per test, Makefile target, maintainer notice

Browse Source 
fixes #216
fixes #211
This commit is contained in:
Christian Schwarz
2019-09-29 18:44:59 +02:00
parent 215848f476
commit 58ab25919e
8 changed files with 161 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platformtest/platformtest_exec.go
View File

@@ -4,13 +4,15 @@ import (
"context"
"fmt"
"os/exec"
"github.com/zrepl/zrepl/util/circlog"
)
type ex struct {
log Logger
}
func newEx(log Logger) *ex {
func NewEx(log Logger) Execer {
return &ex{log}
}
@@ -27,14 +29,15 @@ func (e *ex) runNoOutput(expectSuccess bool, ctx context.Context, cmd string, ar
log.Debug("begin executing")
defer log.Debug("done executing")
ecmd := exec.CommandContext(ctx, cmd, args...)
// use circlog and capture stdout
buf, _ := circlog.NewCircularLog(32 << 10)
ecmd.Stdout, ecmd.Stderr = buf, buf
err := ecmd.Run()
ee, ok := err.(*exec.ExitError)
if err != nil && !ok {
log.Printf("command output: %s", buf.String())
if _, ok := err.(*exec.ExitError); err != nil && !ok {
panic(err)
}
if expectSuccess && err != nil {
return fmt.Errorf("expecting no error, got error: %s\n%s", err, ee.Stderr)
return fmt.Errorf("expecting no error, got error: %s\n%s", err, buf.String())
} else if !expectSuccess && err == nil {
return fmt.Errorf("expecting error, got no error")
}