From 9dd67ad99d2bbf39e61ac79384f7bb818029ce59 Mon Sep 17 00:00:00 2001
From: Sam Kleinman <garen@tychoish.com>
Date: Thu, 20 Jan 2022 15:48:26 -0500
Subject: [PATCH] tests: update cleanup opertunities (#7647)

---
 abci/client/socket_client_test.go  | 7 +++++--
 internal/consensus/reactor_test.go | 8 +++-----
 internal/mempool/reactor_test.go   | 4 +++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/abci/client/socket_client_test.go b/abci/client/socket_client_test.go
index f8248f2ee..556f98566 100644
--- a/abci/client/socket_client_test.go
+++ b/abci/client/socket_client_test.go
@@ -23,7 +23,7 @@ func TestProperSyncCalls(t *testing.T) {
 	defer cancel()
 
 	app := slowApp{}
-	logger := log.TestingLogger()
+	logger := log.NewNopLogger()
 
 	_, c := setupClientServer(ctx, t, logger, app)
 
@@ -33,7 +33,10 @@ func TestProperSyncCalls(t *testing.T) {
 		assert.NoError(t, err)
 		assert.NoError(t, c.Flush(ctx))
 		assert.NotNil(t, rsp)
-		resp <- c.Error()
+		select {
+		case <-ctx.Done():
+		case resp <- c.Error():
+		}
 	}()
 
 	select {
diff --git a/internal/consensus/reactor_test.go b/internal/consensus/reactor_test.go
index 45da5b7eb..b489ca8fa 100644
--- a/internal/consensus/reactor_test.go
+++ b/internal/consensus/reactor_test.go
@@ -81,7 +81,7 @@ func setup(
 	rts.voteSetBitsChannels = rts.network.MakeChannelsNoCleanup(ctx, t, chDesc(VoteSetBitsChannel, size))
 
 	ctx, cancel := context.WithCancel(ctx)
-	// Canceled during cleanup (see below).
+	t.Cleanup(cancel)
 
 	chCreator := func(nodeID types.NodeID) p2p.ChannelCreator {
 		return func(ctx context.Context, desc *p2p.ChannelDescriptor) (*p2p.Channel, error) {
@@ -142,6 +142,7 @@ func setup(
 
 		require.NoError(t, reactor.Start(ctx))
 		require.True(t, reactor.IsRunning())
+		t.Cleanup(reactor.Wait)
 
 		i++
 	}
@@ -151,10 +152,7 @@ func setup(
 	// start the in-memory network and connect all peers with each other
 	rts.network.Start(ctx, t)
 
-	t.Cleanup(func() {
-		cancel()
-		leaktest.Check(t)
-	})
+	t.Cleanup(leaktest.Check(t))
 
 	return rts
 }
diff --git a/internal/mempool/reactor_test.go b/internal/mempool/reactor_test.go
index d8a536084..eeba1e0d9 100644
--- a/internal/mempool/reactor_test.go
+++ b/internal/mempool/reactor_test.go
@@ -45,7 +45,7 @@ func setupReactors(ctx context.Context, t *testing.T, numNodes int, chBuf uint)
 	t.Cleanup(func() { os.RemoveAll(cfg.RootDir) })
 
 	rts := &reactorTestSuite{
-		logger:          log.TestingLogger().With("testCase", t.Name()),
+		logger:          log.NewNopLogger().With("testCase", t.Name()),
 		network:         p2ptest.MakeNetwork(ctx, t, p2ptest.NetworkOptions{NumNodes: numNodes}),
 		reactors:        make(map[types.NodeID]*Reactor, numNodes),
 		mempoolChannels: make(map[types.NodeID]*p2p.Channel, numNodes),
@@ -95,8 +95,10 @@ func setupReactors(ctx context.Context, t *testing.T, numNodes int, chBuf uint)
 		for nodeID := range rts.reactors {
 			if rts.reactors[nodeID].IsRunning() {
 				require.NoError(t, rts.reactors[nodeID].Stop())
+				rts.reactors[nodeID].Wait()
 				require.False(t, rts.reactors[nodeID].IsRunning())
 			}
+
 		}
 	})