TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

tstest: avoid Fatal in ResourceCheck to show panic (#13790)

Browse Source 
Fixes #13789

Signed-off-by: Paul Scott <paul@tailscale.com>
This commit is contained in:
Paul Scott 2024-10-14 10:02:04 +01:00 committed by GitHub
parent 12e6094d9c
commit adc8368964
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tstest/resource.go
View File

@ -29,7 +29,8 @@ func ResourceCheck(tb testing.TB) {
startN, startStacks := goroutines() startN, startStacks := goroutines()
tb.Cleanup(func() { tb.Cleanup(func() {
if tb.Failed() { if tb.Failed() {
// Something else went wrong. // Test has failed - but this doesn't catch panics due to
// https://github.com/golang/go/issues/49929.
return return
} }
// Goroutines might be still exiting. // Goroutines might be still exiting.
@ -44,7 +45,10 @@ func ResourceCheck(tb testing.TB) {
return return
} }
tb.Logf("goroutine diff:\n%v\n", cmp.Diff(startStacks, endStacks)) tb.Logf("goroutine diff:\n%v\n", cmp.Diff(startStacks, endStacks))
tb.Fatalf("goroutine count: expected %d, got %d\n", startN, endN)
// tb.Failed() above won't report on panics, so we shouldn't call Fatal
// here or we risk suppressing reporting of the panic.
tb.Errorf("goroutine count: expected %d, got %d\n", startN, endN)
}) })
} }