Skip to content

Commit

Permalink
Allow 'tests' to use StringArray, too
Browse files Browse the repository at this point in the history
This allows usage i.e.:

    skiplist:
      - reason: Some test reason
        url: https://bugs.linaro.org/show_bug.cgi?id=3145
        environments: production
        boards: x15
        branches: "4.4"
        tests: run_vmtests

Before this change, environments/boards/branches could be either a list or a
value, but not tests. Fix this inconsistency. I have no idea why I didn't
anticipate this usecase.

Signed-off-by: Dan Rue <dan.rue@linaro.org>
  • Loading branch information
danrue committed Mar 1, 2018
1 parent ab8d707 commit ac2b220
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion skipgen.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ type Skipfile struct {
Environments StringArray
Boards StringArray
Branches StringArray
Tests []string
Tests StringArray
}
}

Expand Down
12 changes: 4 additions & 8 deletions skipgen_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,10 @@ func TestSkipMinimum(t *testing.T) {
skiplist:
- reason: Some test reason
url: https://bugs.linaro.org/show_bug.cgi?id=3145
environments:
- production
boards:
- x15
branches:
- "4.4"
tests:
- run_vmtests
environments: production # Test UnmarshallYAML
boards: x15 # Test UnmarshallYAML
branches: "4.4" # Test UnmarshallYAML
tests: run_vmtests # Test UnmarshallYAML
`
skips, err := parseSkipfile([]byte(skipAll))
if err != nil {
Expand Down

0 comments on commit ac2b220

Please sign in to comment.