diff options
| author | Russ Cox <rsc@golang.org> | 2018-01-04 13:25:31 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2018-01-04 20:12:12 +0000 |
| commit | b32ac54620067dacc793192fb862ddf2e6cd4386 (patch) | |
| tree | a096148f64ed74b2af4013805e3c036e7652efaa /src/cmd/internal/test2json/testdata | |
| parent | 23e68d7651a0017a6fc8223a964ec3d6db53d4bb (diff) | |
| download | go-b32ac54620067dacc793192fb862ddf2e6cd4386.tar.xz | |
cmd/test2json: fix test log output containing test output
If test case framing appears in ordinary test output,
then test2json can get confused. If the fake framing is being
saved with t.Logf/t.Errorf/etc then we can already
distinguish it from real framing, and the code did.
It just forgot to write that framing as output (1-line fix).
If the fake framing is being generated by printing directly
to stdout/stderr, then test2json will simply get confused.
There's not a lot to do at that point (maybe it's even a feature).
Fixes #23036.
Change-Id: I29449c7ace304172b89d8babe23de507c0500455
Reviewed-on: https://go-review.googlesource.com/86238
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/cmd/internal/test2json/testdata')
| -rw-r--r-- | src/cmd/internal/test2json/testdata/issue23036.json | 12 | ||||
| -rw-r--r-- | src/cmd/internal/test2json/testdata/issue23036.test | 9 |
2 files changed, 21 insertions, 0 deletions
diff --git a/src/cmd/internal/test2json/testdata/issue23036.json b/src/cmd/internal/test2json/testdata/issue23036.json new file mode 100644 index 0000000000..935c0c5fc0 --- /dev/null +++ b/src/cmd/internal/test2json/testdata/issue23036.json @@ -0,0 +1,12 @@ +{"Action":"run","Test":"TestActualCase"} +{"Action":"output","Test":"TestActualCase","Output":"=== RUN TestActualCase\n"} +{"Action":"output","Test":"TestActualCase","Output":"--- FAIL: TestActualCase (0.00s)\n"} +{"Action":"output","Test":"TestActualCase","Output":" foo_test.go:14: Differed.\n"} +{"Action":"output","Test":"TestActualCase","Output":" Expected: MyTest:\n"} +{"Action":"output","Test":"TestActualCase","Output":" --- FAIL: Test output from other tool\n"} +{"Action":"output","Test":"TestActualCase","Output":" Actual: not expected\n"} +{"Action":"fail","Test":"TestActualCase"} +{"Action":"output","Output":"FAIL\n"} +{"Action":"output","Output":"exit status 1\n"} +{"Action":"output","Output":"FAIL github.com/org/project/badtest 0.049s\n"} +{"Action":"fail"} diff --git a/src/cmd/internal/test2json/testdata/issue23036.test b/src/cmd/internal/test2json/testdata/issue23036.test new file mode 100644 index 0000000000..fd4774f4b6 --- /dev/null +++ b/src/cmd/internal/test2json/testdata/issue23036.test @@ -0,0 +1,9 @@ +=== RUN TestActualCase +--- FAIL: TestActualCase (0.00s) + foo_test.go:14: Differed. + Expected: MyTest: + --- FAIL: Test output from other tool + Actual: not expected +FAIL +exit status 1 +FAIL github.com/org/project/badtest 0.049s |