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.

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

Enable specifying test subsets #12

Merged
merged 1 commit into from
Jul 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ CLI arguments:
- `--outDir` Location on the filesystem to download and unpack a zip file specified in `--testsRemote`. Has no meaning if `--testsRemote` is not specified.
- `--target` URL of any appliance serving the Ethereum 2.0 API.
- `--timeout` Time after which to abandon waiting tests. Defaults to 10 minutes. Uses [Go duration syntax](https://golang.org/pkg/time/#ParseDuration).
- `--subset` The subset of paths to run tests for. For example, set this to "/v1/node" to only run tests for routes in that path. Defaults to "/" (all paths).

## Syntax of test cases

Expand Down
3 changes: 2 additions & 1 deletion cmd/eth2-comply/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ func main() {
outDir := flag.String("outDir", "/tmp", "A directory where zip files will be downloaded and unzipped.")
target := flag.String("target", "NO TARGET PROVIDED", "A URL to run tests against, for example http://localhost:5051")
timeout := flag.String("timeout", "10m", "The time to wait for a case execution to complete. For example, 3600s, 60m, 1h")
subset := flag.String("subset", "/", "The subset of paths to run tests for. For example, set this to \"/v1/node\" to only run tests for routes in that path. Defaults to \"/\" (all paths).")
flag.Parse()

// Setup OAPI client.
Expand Down Expand Up @@ -51,7 +52,7 @@ func main() {

// Execute test cases.
for _, testCase := range testCases {
go testCase.Exec(ctx)
go testCase.Exec(ctx, *subset)
}

// Concurrent helper function cancels contexts (tests) that timeout.
Expand Down
1 change: 0 additions & 1 deletion pkg/testcases/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ func All(opts *TestsCasesOpts) ([]*Case, error) {
}

for _, config := range configs {
config.Route = opts.Target + config.Route
if err != nil {
return nil, err
}
Expand Down
14 changes: 12 additions & 2 deletions pkg/testcases/testcases.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ type Case struct {
Config CaseConfig
OapiClient *eth2spec.APIClient
Result Result
Skipped bool
Done chan struct{}
}

Expand Down Expand Up @@ -83,9 +84,16 @@ func (e ExpectationsError) Error() string {
// (is ill-formed), or a network condition prevented contacting the target.
//
// Otherwise, the Result is marked as a Success and the Error is left nil.
func (c *Case) Exec(ctx context.Context) {
func (c *Case) Exec(ctx context.Context, pathsRoot string) {
defer close(c.Done)

// If a test should be excluded because it is not beneath the paths root,
// skip it here.
if !strings.HasPrefix(c.Config.Route, pathsRoot) {
c.Skipped = true
return
}

// If a test specifies an await slot, wait for the node to sync that slot.
// Otherwise, just wait for the node to be healthy. awaitTargetHasSlot
// uses awaitTargetIsHealthy internally.
Expand Down Expand Up @@ -154,7 +162,9 @@ func (c Case) PrintResults() {

fmt.Printf("%s ", routeString)

if !c.Result.Success {
if c.Skipped {
fmt.Printf("Skipped\n")
} else if !c.Result.Success {
fmt.Printf("❌\n")
fmt.Println(c.Result.Error)
} else {
Expand Down