Skip to content

Commit

Permalink
Merge pull request #269 from gotestyourself/go1.19
Browse files Browse the repository at this point in the history
Test against go1.19, remove go1.15
  • Loading branch information
dnephin committed Aug 6, 2022
2 parents 2dab86a + 349eeb2 commit 071f4a1
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 23 deletions.
18 changes: 9 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ orbs:
workflows:
ci:
jobs:
- go/test:
name: test-go-1.15
gotestsum-format: testname
executor:
name: go/golang
tag: 1.15-alpine

- go/test:
name: test-go-1.16
gotestsum-format: testname
Expand All @@ -34,6 +27,13 @@ workflows:
name: go/golang
tag: 1.18-alpine

- go/test:
name: test-go-1.19
gotestsum-format: testname
executor:
name: go/golang
tag: 1.19-alpine

- go/test:
name: test-windows
executor: windows
Expand All @@ -47,7 +47,7 @@ workflows:
- run: go version

- go/lint:
golangci-lint-version: 1.42.0
golangci-lint-version: 1.48.0

- build
- run
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
default: false
executor:
name: go/golang
tag: 1.18-alpine
tag: 1.19-alpine
steps:
- go/install: {package: git}
- go/install-ssh
Expand Down
3 changes: 2 additions & 1 deletion internal/dotwriter/writer.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*Package dotwriter implements a buffered Writer for updating progress on the
/*
Package dotwriter implements a buffered Writer for updating progress on the
terminal.
*/
package dotwriter
Expand Down
26 changes: 13 additions & 13 deletions testjson/doc.go
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
/*Package testjson scans test2json output and builds up a summary of the events.
/*
Package testjson scans test2json output and builds up a summary of the events.
Events are passed to a formatter for output.
Example
# Example
This example reads the test2json output from os.Stdin. It sends every
event to the handler, builds an Execution from the output, then it
prints the number of tests run.
exec, err := testjson.ScanTestOutput(testjson.ScanConfig{
// Stdout is a reader that provides the test2json output stream.
Stdout: os.Stdin,
// Handler receives TestEvents and error lines.
Handler: eventHandler,
})
if err != nil {
return fmt.Errorf("failed to scan testjson: %w", err)
}
fmt.Println("Ran %d tests", exec.Total())
exec, err := testjson.ScanTestOutput(testjson.ScanConfig{
// Stdout is a reader that provides the test2json output stream.
Stdout: os.Stdin,
// Handler receives TestEvents and error lines.
Handler: eventHandler,
})
if err != nil {
return fmt.Errorf("failed to scan testjson: %w", err)
}
fmt.Println("Ran %d tests", exec.Total())
*/
package testjson // import "gotest.tools/gotestsum/testjson"
1 change: 1 addition & 0 deletions testjson/execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ func (p *Package) Output(id int) string {
// As a workaround for test output being attributed to the wrong subtest, if:
// - the TestCase is a root TestCase (not a subtest), and
// - the TestCase has no subtest failures;
//
// then all output for every subtest under the root test is returned.
// See https://github.com/golang/go/issues/29755.
func (p *Package) OutputLines(tc TestCase) []string {
Expand Down

0 comments on commit 071f4a1

Please sign in to comment.