Misc fixes

mafredri · mafredri · commit a72d04ce0a94 · 2023-06-13T16:43:37.000Z
diff --git a/enterprise/replicasync/replicasync_test.go b/enterprise/replicasync/replicasync_test.go
@@ -34,7 +34,10 @@ func TestReplica(t *testing.T) {
 		db, pubsub := dbtestutil.NewDB(t)
 		closeChan := make(chan struct{}, 1)
 		cancel, err := pubsub.Subscribe(replicasync.PubsubEvent, func(ctx context.Context, message []byte) {
-			closeChan <- struct{}{}
+			select {
+			case closeChan <- struct{}{}:
+			default:
+			}
 		})
 		require.NoError(t, err)
 		defer cancel()
@@ -70,6 +73,8 @@ func TestReplica(t *testing.T) {
 			RelayAddress: "http://169.254.169.254",
 		})
 		require.NoError(t, err)
+		defer server.Close()
+
 		require.Len(t, server.Regional(), 1)
 		require.Equal(t, peer.ID, server.Regional()[0].ID)
 		require.Empty(t, server.Self().Error)
@@ -113,6 +118,8 @@ func TestReplica(t *testing.T) {
 			TLSConfig:    tlsConfig,
 		})
 		require.NoError(t, err)
+		defer server.Close()
+
 		require.Len(t, server.Regional(), 1)
 		require.Equal(t, peer.ID, server.Regional()[0].ID)
 		require.Empty(t, server.Self().Error)
@@ -138,6 +145,8 @@ func TestReplica(t *testing.T) {
 			RelayAddress: "http://127.0.0.1:1",
 		})
 		require.NoError(t, err)
+		defer server.Close()
+
 		require.Len(t, server.Regional(), 1)
 		require.Equal(t, peer.ID, server.Regional()[0].ID)
 		require.NotEmpty(t, server.Self().Error)
@@ -152,6 +161,7 @@ func TestReplica(t *testing.T) {
 		defer cancelCtx()
 		server, err := replicasync.New(ctx, slogtest.Make(t, nil), db, pubsub, nil)
 		require.NoError(t, err)
+		defer server.Close()
 		srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusOK)
 		}))
