forked from ethereum/go-ethereum
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cmd/devp2p, internal/utesting: implement TAP output (ethereum#21760)
TAP is a text format for test results. Parsers for it are available in many languages, making it easy to consume. I want TAP output from our protocol tests because the Hive wrapper around them needs to know about the test names and their individual results and logs. It would also be possible to just write this info as JSON, but I don't want to invent a new format. This also improves the normal console output for tests (when running without --tap). It now prints -- RUN lines before any output from the test, and indents the log output by one space.
- Loading branch information
1 parent
9109549
commit 7387d1a
Showing
6 changed files
with
329 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| // Copyright 2020 The go-ethereum Authors | ||
| // This file is part of go-ethereum. | ||
| // | ||
| // go-ethereum is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // go-ethereum is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "os" | ||
|
|
||
| "github.com/ethereum/go-ethereum/cmd/devp2p/internal/v4test" | ||
| "github.com/ethereum/go-ethereum/internal/utesting" | ||
| "github.com/ethereum/go-ethereum/log" | ||
| "gopkg.in/urfave/cli.v1" | ||
| ) | ||
|
|
||
| var ( | ||
| testPatternFlag = cli.StringFlag{ | ||
| Name: "run", | ||
| Usage: "Pattern of test suite(s) to run", | ||
| } | ||
| testTAPFlag = cli.BoolFlag{ | ||
| Name: "tap", | ||
| Usage: "Output TAP", | ||
| } | ||
| // These two are specific to the discovery tests. | ||
| testListen1Flag = cli.StringFlag{ | ||
| Name: "listen1", | ||
| Usage: "IP address of the first tester", | ||
| Value: v4test.Listen1, | ||
| } | ||
| testListen2Flag = cli.StringFlag{ | ||
| Name: "listen2", | ||
| Usage: "IP address of the second tester", | ||
| Value: v4test.Listen2, | ||
| } | ||
| ) | ||
|
|
||
| func runTests(ctx *cli.Context, tests []utesting.Test) error { | ||
| // Filter test cases. | ||
| if ctx.IsSet(testPatternFlag.Name) { | ||
| tests = utesting.MatchTests(tests, ctx.String(testPatternFlag.Name)) | ||
| } | ||
| // Disable logging unless explicitly enabled. | ||
| if !ctx.GlobalIsSet("verbosity") && !ctx.GlobalIsSet("vmodule") { | ||
| log.Root().SetHandler(log.DiscardHandler()) | ||
| } | ||
| // Run the tests. | ||
| var run = utesting.RunTests | ||
| if ctx.Bool(testTAPFlag.Name) { | ||
| run = utesting.RunTAP | ||
| } | ||
| results := run(tests, os.Stdout) | ||
| if utesting.CountFailures(results) > 0 { | ||
| os.Exit(1) | ||
| } | ||
| return nil | ||
| } |
Oops, something went wrong.