Browse Source

integration: add WaitGroup to prevent calling t.Fatalf after TestV3WatchCurrentPutOverlap function return

It could cause a panic when it happens

Fixes #10886
yzm 6 years ago
parent
commit
d87bd2c87c
1 changed files with 4 additions and 0 deletions
  1. 4 0
      integration/v3_watch_test.go

+ 4 - 0
integration/v3_watch_test.go

@@ -479,8 +479,11 @@ func TestV3WatchCurrentPutOverlap(t *testing.T) {
 	// last mod_revision that will be observed
 	// last mod_revision that will be observed
 	nrRevisions := 32
 	nrRevisions := 32
 	// first revision already allocated as empty revision
 	// first revision already allocated as empty revision
+	var wg sync.WaitGroup
 	for i := 1; i < nrRevisions; i++ {
 	for i := 1; i < nrRevisions; i++ {
+		wg.Add(1)
 		go func() {
 		go func() {
+			defer wg.Done()
 			kvc := toGRPC(clus.RandClient()).KV
 			kvc := toGRPC(clus.RandClient()).KV
 			req := &pb.PutRequest{Key: []byte("foo"), Value: []byte("bar")}
 			req := &pb.PutRequest{Key: []byte("foo"), Value: []byte("bar")}
 			if _, err := kvc.Put(context.TODO(), req); err != nil {
 			if _, err := kvc.Put(context.TODO(), req); err != nil {
@@ -488,6 +491,7 @@ func TestV3WatchCurrentPutOverlap(t *testing.T) {
 			}
 			}
 		}()
 		}()
 	}
 	}
+	wg.Wait()
 
 
 	// maps watcher to current expected revision
 	// maps watcher to current expected revision
 	progress := make(map[int64]int64)
 	progress := make(map[int64]int64)