itest: close context after closing conn for client

ViktorT-11 · ViktorT-11 · commit 6b5ca8b4895c · 2024-01-09T02:36:37.000+01:00
diff --git a/itest/client_harness.go b/itest/client_harness.go
@@ -119,6 +119,9 @@ func (c *clientHarness) start() error {
 }
 
 func (c *clientHarness) cleanup() error {
-	c.cancel()
+	// we always want to cancel the context, even if
+	// c.grpcConn.Close() returns an error.
+	defer c.cancel()
+
 	return c.grpcConn.Close()
 }

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,9 @@ func (c *clientHarness) start() error {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`func (c *clientHarness) cleanup() error {`
`122`		`- c.cancel()`
	`122`	`+ // we always want to cancel the context, even if`
	`123`	`+ // c.grpcConn.Close() returns an error.`
	`124`	`+ defer c.cancel()`
	`125`	`+`
`123`	`126`	`return c.grpcConn.Close()`
`124`	`127`	`}`