Skip to content

Commit 570063a

Browse files
authored
chore: clean up some test warnings (#469)
1 parent 21ed1e3 commit 570063a

File tree

6 files changed

+59
-51
lines changed

6 files changed

+59
-51
lines changed

conn_with_mockserver_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ func TestSetIsolationLevel(t *testing.T) {
273273
if g, w := level, sql.LevelSnapshot; g != w {
274274
t.Fatalf("isolation level mismatch\n Got: %v\nWant: %v", g, w)
275275
}
276-
conn.Close()
276+
_ = conn.Close()
277277
}
278278
}
279279

@@ -335,7 +335,7 @@ func TestDDLUsingQueryContextInReadOnlyTx(t *testing.T) {
335335
if err != nil {
336336
t.Fatal(err)
337337
}
338-
defer tx.Rollback()
338+
defer func() { _ = tx.Rollback() }()
339339

340340
// DDL statements should not use the query context in a read-only transaction.
341341
_, err = tx.QueryContext(ctx, "CREATE TABLE Foo (Bar STRING(100))")
@@ -358,7 +358,7 @@ func TestDDLUsingQueryContextInReadWriteTransaction(t *testing.T) {
358358
if err != nil {
359359
t.Fatal(err)
360360
}
361-
defer tx.Rollback()
361+
defer func() { _ = tx.Rollback() }()
362362

363363
// DDL statements should not use the query context in a read-write transaction.
364364
_, err = tx.QueryContext(ctx, "CREATE TABLE Foo (Bar STRING(100))")

connection_leak_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func simpleQuery(ctx context.Context, t *testing.T, db *sql.DB) {
7575
if err != nil {
7676
t.Fatal(err)
7777
}
78-
defer rows.Close()
78+
defer silentClose(rows)
7979

8080
for want := int64(1); rows.Next(); want++ {
8181
_, err := rows.Columns()
@@ -202,7 +202,7 @@ func readOnlyTxWithStaleness(ctx context.Context, t *testing.T, db *sql.DB) {
202202
if err != nil {
203203
t.Fatal(err)
204204
}
205-
defer conn.Close()
205+
defer silentClose(conn)
206206
if _, err := conn.ExecContext(ctx, "SET READ_ONLY_STALENESS = 'EXACT_STALENESS 10s'"); err != nil {
207207
t.Fatalf("Set read-only staleness: %v", err)
208208
}
@@ -233,7 +233,7 @@ func simpleReadWriteTx(ctx context.Context, t *testing.T, db *sql.DB) {
233233
if err != nil {
234234
t.Fatal(err)
235235
}
236-
defer conn.Close()
236+
defer silentClose(conn)
237237
if _, err := conn.ExecContext(ctx, "set max_commit_delay='10ms'"); err != nil {
238238
t.Fatal(err)
239239
}

driver_test.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"database/sql/driver"
2121
"encoding/json"
2222
"fmt"
23+
"io"
2324
"net"
2425
"reflect"
2526
"testing"
@@ -34,7 +35,12 @@ import (
3435
"google.golang.org/grpc/codes"
3536
)
3637

38+
func silentClose(c io.Closer) {
39+
_ = c.Close()
40+
}
41+
3742
func TestExtractDnsParts(t *testing.T) {
43+
//goland:noinspection GoDeprecation
3844
tests := []struct {
3945
input string
4046
wantConnectorConfig ConnectorConfig
@@ -470,7 +476,7 @@ func ExampleCreateConnector() {
470476
db := sql.OpenDB(c)
471477
// Use the database ...
472478

473-
defer db.Close()
479+
defer silentClose(db)
474480
}
475481

476482
func TestConnection_Reset(t *testing.T) {

0 commit comments

Comments
 (0)