cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-29 03:11:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

testing: fixed bug introduced by CL 21504

Browse Source 
This broke T.Run

Change-Id: I12c8fe3612f3fa2caa83049c1c7003056daf2b0c
Reviewed-on: https://go-review.googlesource.com/21600
Run-TryBot: Marcel van Lohuizen <mpvl@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Marcel van Lohuizen 2016-04-06 09:59:32 +02:00
parent d70cb46f0f
commit 63cea5ac2b
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/testing/sub_test.go
View File

@ -178,6 +178,22 @@ func TestTRun(t *T) {
=== RUN skipping without message, chatty
--- SKIP: skipping without message, chatty (0.00s)`,
f: func(t *T) { t.SkipNow() },
}, {
desc: "chatty with recursion",
ok: true,
chatty: true,
output: `
=== RUN chatty with recursion
=== RUN chatty with recursion/#00
=== RUN chatty with recursion/#00/#00
--- PASS: chatty with recursion (0.00s)
--- PASS: chatty with recursion/#00 (0.00s)
--- PASS: chatty with recursion/#00/#00 (0.00s)`,
f: func(t *T) {
t.Run("", func(t *T) {
t.Run("", func(t *T) {})
})
},
}, {
desc: "skipping without message, not chatty",
ok: true,
@ -435,6 +451,14 @@ func TestBRun(t *T) {
--- SKIP: root
sub_test.go:: skipping`,
f: func(b *B) { b.Skip("skipping") },
}, {
desc: "chatty with recursion",
chatty: true,
f: func(b *B) {
b.Run("", func(b *B) {
b.Run("", func(b *B) {})
})
},
}, {
desc: "skipping without message, not chatty",
f: func(b *B) { b.SkipNow() },

2
src/testing/testing.go
View File

@ -571,7 +571,7 @@ func (t *T) Run(name string, f func(t *T)) bool {
if t.chatty {
// Print directly to root's io.Writer so there is no delay.
root := t.parent
for ; root.parent != nil; root = t.parent {
for ; root.parent != nil; root = root.parent {
}
fmt.Fprintf(root.w, "=== RUN %s\n", t.name)
}