Merge pull request #13558 from gfuzz-asplos/main

fixing goroutine leaks

server/auth/store_test.go

@@ -33,7 +33,7 @@ import (
 )
 
 func dummyIndexWaiter(index uint64) <-chan struct{} {
-	ch := make(chan struct{})
+	ch := make(chan struct{}, 1)
 	go func() {
 		ch <- struct{}{}
 	}()

server/storage/mvcc/kvstore_test.go

@@ -724,6 +724,8 @@ func TestConcurrentReadTxAndWrite(t *testing.T) {
 	)
 	b, tmpPath := betesting.NewDefaultTmpBackend(t)
 	s := NewStore(zap.NewExample(), b, &lease.FakeLessor{}, StoreConfig{})
+	defer b.Close()
+	defer s.Close()
 	defer os.Remove(tmpPath)
 
 	var wg sync.WaitGroup

server/storage/mvcc/watchable_store_test.go

@@ -265,7 +265,8 @@ func TestWatchFutureRev(t *testing.T) {
 	s := newWatchableStore(zap.NewExample(), b, &lease.FakeLessor{}, StoreConfig{})
 
 	defer func() {
-		s.store.Close()
+		b.Close()
+		s.Close()
 		os.Remove(tmpPath)
 	}()
 

server/storage/mvcc/watcher_test.go

@@ -216,7 +216,8 @@ func TestWatchDeleteRange(t *testing.T) {
 	s := newWatchableStore(zap.NewExample(), b, &lease.FakeLessor{}, StoreConfig{})
 
 	defer func() {
-		s.store.Close()
+		b.Close()
+		s.Close()
 		os.Remove(tmpPath)
 	}()