Merge pull request #2595 from IBM/dnwe/close

fix(test): ensure some more clients are closed
IBM · Aug 12, 2023 · 868ed33 · 868ed33
2 parents 45313c3 + b0363d1
commit 868ed33
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/client_test.go b/client_test.go
@@ -13,6 +13,7 @@ import (
 )
 
 func safeClose(t testing.TB, c io.Closer) {
+	t.Helper()
 	err := c.Close()
 	if err != nil {
 		t.Error(err)
@@ -51,6 +52,7 @@ func TestCachedPartitions(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer safeClose(t, c)
 	client := c.(*client)
 
 	// Verify they aren't cached the same
@@ -69,7 +71,6 @@ func TestCachedPartitions(t *testing.T) {
 	}
 
 	seedBroker.Close()
-	safeClose(t, client)
 }
 
 func TestClientDoesntCachePartitionsForTopicsWithErrors(t *testing.T) {

diff --git a/functional_producer_test.go b/functional_producer_test.go
@@ -587,6 +587,7 @@ func TestFuncTxnAbortedProduce(t *testing.T) {
 
 	client, err := NewClient(FunctionalTestEnv.KafkaBrokerAddrs, config)
 	require.NoError(t, err)
+	defer client.Close()
 
 	consumer, err := NewConsumerFromClient(client)
 	require.NoError(t, err)
@@ -745,6 +746,7 @@ func TestInterceptors(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer safeClose(t, client)
 
 	initialOffset, err := client.GetOffset("test.1", 0, OffsetNewest)
 	if err != nil {
@@ -800,7 +802,6 @@ func TestInterceptors(t *testing.T) {
 		}
 	}
 	safeClose(t, consumer)
-	safeClose(t, client)
 }
 
 func testProducingMessages(t *testing.T, config *Config) {
@@ -821,6 +822,7 @@ func testProducingMessages(t *testing.T, config *Config) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer safeClose(t, client)
 
 	// Keep in mind the current offset
 	initialOffset, err := client.GetOffset("test.1", 0, OffsetNewest)
@@ -885,7 +887,6 @@ func testProducingMessages(t *testing.T, config *Config) {
 	validateConsumerMetrics(t, client)
 
 	safeClose(t, consumer)
-	safeClose(t, client)
 }
 
 // TestAsyncProducerRemoteBrokerClosed ensures that the async producer can

diff --git a/internal/toxiproxy/client.go b/internal/toxiproxy/client.go
@@ -24,7 +24,8 @@ func NewClient(endpoint string) *Client {
 					KeepAlive: 30 * time.Second,
 				}).DialContext,
 				ForceAttemptHTTP2:     true,
-				MaxIdleConns:          100,
+				MaxIdleConns:          -1,
+				DisableKeepAlives:     true,
 				IdleConnTimeout:       90 * time.Second,
 				TLSHandshakeTimeout:   10 * time.Second,
 				ExpectContinueTimeout: 1 * time.Second,