From 984badeb03b2aa2ccf02bb9a763ae6b521f9e6c2 Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Fri, 15 Jul 2016 16:46:02 -0700 Subject: [PATCH] testutil, clientv3: wait for panics in txn tests to complete Fixes #5901 --- clientv3/txn_test.go | 4 ++++ pkg/testutil/leak.go | 1 + 2 files changed, 5 insertions(+) diff --git a/clientv3/txn_test.go b/clientv3/txn_test.go index e936d34ee..d48151612 100644 --- a/clientv3/txn_test.go +++ b/clientv3/txn_test.go @@ -17,9 +17,13 @@ package clientv3 import ( "testing" "time" + + "github.com/coreos/etcd/pkg/testutil" ) func TestTxnPanics(t *testing.T) { + defer testutil.AfterTest(t) + kv := &kv{} errc := make(chan string) diff --git a/pkg/testutil/leak.go b/pkg/testutil/leak.go index 0f2ee559f..ca659430c 100644 --- a/pkg/testutil/leak.go +++ b/pkg/testutil/leak.go @@ -106,6 +106,7 @@ func interestingGoroutines() (gs []string) { } stack := strings.TrimSpace(sl[1]) if stack == "" || + strings.Contains(stack, "runtime/panic.go") || strings.Contains(stack, "created by testing.RunTests") || strings.Contains(stack, "testing.Main(") || strings.Contains(stack, "runtime.goexit") ||