testutil, clientv3: wait for panics in txn tests to complete

Fixes #5901
This commit is contained in:
Anthony Romano 2016-07-15 16:46:02 -07:00
parent 336e4f2f28
commit 984badeb03
2 changed files with 5 additions and 0 deletions

View File

@ -17,9 +17,13 @@ package clientv3
import ( import (
"testing" "testing"
"time" "time"
"github.com/coreos/etcd/pkg/testutil"
) )
func TestTxnPanics(t *testing.T) { func TestTxnPanics(t *testing.T) {
defer testutil.AfterTest(t)
kv := &kv{} kv := &kv{}
errc := make(chan string) errc := make(chan string)

View File

@ -106,6 +106,7 @@ func interestingGoroutines() (gs []string) {
} }
stack := strings.TrimSpace(sl[1]) stack := strings.TrimSpace(sl[1])
if stack == "" || if stack == "" ||
strings.Contains(stack, "runtime/panic.go") ||
strings.Contains(stack, "created by testing.RunTests") || strings.Contains(stack, "created by testing.RunTests") ||
strings.Contains(stack, "testing.Main(") || strings.Contains(stack, "testing.Main(") ||
strings.Contains(stack, "runtime.goexit") || strings.Contains(stack, "runtime.goexit") ||