Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for external test harness #343

Merged
merged 1 commit into from
Jun 9, 2020
Merged

Add support for external test harness #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions tests/harness/executor/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ func main() {
ccFlag := flag.Bool("cc", false, "Run c++ test harness")
javaFlag := flag.Bool("java", false, "Run java test harness")
pythonFlag := flag.Bool("python", false, "Run python test harness")
externalHarnessFlag := flag.String("external_harness", "", "Path to a binary to be executed as an external test harness")
flag.Parse()

start := time.Now()
successes, failures, skips := run(*parallelism, *goFlag, *gogoFlag, *ccFlag, *javaFlag, *pythonFlag)
harnesses := Harnesses(*goFlag, *gogoFlag, *ccFlag, *javaFlag, *pythonFlag, *externalHarnessFlag)
successes, failures, skips := run(*parallelism, harnesses)

log.Printf("Successes: %d | Failures: %d | Skips: %d (%v)",
successes, failures, skips, time.Since(start))
Expand All @@ -34,12 +36,12 @@ func main() {
}
}

func run(parallelism int, goFlag bool, gogoFlag bool, ccFlag bool, javaFlag bool, pythonFlag bool) (successes, failures, skips uint64) {
func run(parallelism int, harnesses []Harness) (successes, failures, skips uint64) {
wg := new(sync.WaitGroup)
if parallelism <= 0 {
panic("Parallelism must be > 0")
}
if !(goFlag || gogoFlag || ccFlag || javaFlag || pythonFlag) {
if len(harnesses) == 0 {
panic("At least one harness must be selected with a flag")
}
wg.Add(parallelism)
Expand All @@ -49,7 +51,7 @@ func run(parallelism int, goFlag bool, gogoFlag bool, ccFlag bool, javaFlag bool
done := make(chan struct{})

for i := 0; i < parallelism; i++ {
go Work(wg, in, out, goFlag, gogoFlag, ccFlag, javaFlag, pythonFlag)
go Work(wg, in, out, harnesses)
}

go func() {
Expand Down
7 changes: 5 additions & 2 deletions tests/harness/executor/harness.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (

"strings"

"github.com/golang/protobuf/proto"
harness "github.com/envoyproxy/protoc-gen-validate/tests/harness/go"
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
)

func Harnesses(goFlag bool, gogoFlag bool, ccFlag bool, javaFlag bool, pythonFlag bool) []Harness {
func Harnesses(goFlag bool, gogoFlag bool, ccFlag bool, javaFlag bool, pythonFlag bool, externalHarnessFlag string) []Harness {
harnesses := make([]Harness, 0)
if goFlag {
harnesses = append(harnesses, InitHarness("tests/harness/go/main/go-harness"))
Expand All @@ -34,6 +34,9 @@ func Harnesses(goFlag bool, gogoFlag bool, ccFlag bool, javaFlag bool, pythonFla
if pythonFlag {
harnesses = append(harnesses, InitHarness("tests/harness/python/python-harness"))
}
if externalHarnessFlag != "" {
harnesses = append(harnesses, InitHarness(externalHarnessFlag))
}
return harnesses
}

Expand Down
10 changes: 4 additions & 6 deletions tests/harness/executor/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ import (
"sync"
"time"

harness "github.com/envoyproxy/protoc-gen-validate/tests/harness/go"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
harness "github.com/envoyproxy/protoc-gen-validate/tests/harness/go"
)

func Work(wg *sync.WaitGroup, in <-chan TestCase, out chan<- TestResult, goFlag bool, gogoFlag bool, ccFlag bool, javaFlag bool, pythonFlag bool) {
func Work(wg *sync.WaitGroup, in <-chan TestCase, out chan<- TestResult, harnesses []Harness) {
for tc := range in {
ok, skip := execTestCase(tc, goFlag, gogoFlag, ccFlag, javaFlag, pythonFlag)
ok, skip := execTestCase(tc, harnesses)
out <- TestResult{ok, skip}
}
wg.Done()
}

func execTestCase(tc TestCase, goFlag bool, gogoFlag bool, ccFlag bool, javaFlag bool, pythonFlag bool) (ok, skip bool) {
func execTestCase(tc TestCase, harnesses []Harness) (ok, skip bool) {
any, err := ptypes.MarshalAny(tc.Message)
if err != nil {
log.Printf("unable to convert test case %q to Any - %v", tc.Name, err)
Expand All @@ -37,8 +37,6 @@ func execTestCase(tc TestCase, goFlag bool, gogoFlag bool, ccFlag bool, javaFlag
ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
defer cancel()

harnesses := Harnesses(goFlag, gogoFlag, ccFlag, javaFlag, pythonFlag)

wg := new(sync.WaitGroup)
wg.Add(len(harnesses))

Expand Down