@@ -1502,6 +1502,9 @@ func TestDdlBatch(t *testing.T) {
15021502
15031503 statements := []string {"CREATE TABLE FOO" , "CREATE TABLE BAR" }
15041504 conn , err := db .Conn (ctx )
1505+ if err != nil {
1506+ t .Fatal (err )
1507+ }
15051508 defer conn .Close ()
15061509
15071510 if _ , err = conn .ExecContext (ctx , "START BATCH DDL" ); err != nil {
@@ -1543,6 +1546,9 @@ func TestAbortDdlBatch(t *testing.T) {
15431546
15441547 statements := []string {"CREATE TABLE FOO" , "CREATE TABLE BAR" }
15451548 c , err := db .Conn (ctx )
1549+ if err != nil {
1550+ t .Fatal (err )
1551+ }
15461552 defer c .Close ()
15471553
15481554 if _ , err = c .ExecContext (ctx , "START BATCH DDL" ); err != nil {
@@ -1912,7 +1918,11 @@ func TestCommitTimestamp(t *testing.T) {
19121918 defer teardown ()
19131919
19141920 conn , err := db .Conn (ctx )
1915- defer conn .Close ()
1921+ defer func () {
1922+ if err := conn .Close (); err != nil {
1923+ t .Fatal (err )
1924+ }
1925+ }()
19161926 if err != nil {
19171927 t .Fatalf ("failed to get a connection: %v" , err )
19181928 }
@@ -1947,7 +1957,11 @@ func TestCommitTimestampAutocommit(t *testing.T) {
19471957 defer teardown ()
19481958
19491959 conn , err := db .Conn (ctx )
1950- defer conn .Close ()
1960+ defer func () {
1961+ if err := conn .Close (); err != nil {
1962+ t .Fatal (err )
1963+ }
1964+ }()
19511965 if err != nil {
19521966 t .Fatalf ("failed to get a connection: %v" , err )
19531967 }
@@ -1978,7 +1992,11 @@ func TestCommitTimestampFailsAfterRollback(t *testing.T) {
19781992 defer teardown ()
19791993
19801994 conn , err := db .Conn (ctx )
1981- defer conn .Close ()
1995+ defer func () {
1996+ if err := conn .Close (); err != nil {
1997+ t .Fatal (err )
1998+ }
1999+ }()
19822000 if err != nil {
19832001 t .Fatalf ("failed to get a connection: %v" , err )
19842002 }
@@ -2007,7 +2025,11 @@ func TestCommitTimestampFailsAfterAutocommitQuery(t *testing.T) {
20072025 defer teardown ()
20082026
20092027 conn , err := db .Conn (ctx )
2010- defer conn .Close ()
2028+ defer func () {
2029+ if err := conn .Close (); err != nil {
2030+ t .Fatal (err )
2031+ }
2032+ }()
20112033 if err != nil {
20122034 t .Fatalf ("failed to get a connection: %v" , err )
20132035 }
@@ -2034,7 +2056,11 @@ func TestShowVariableCommitTimestamp(t *testing.T) {
20342056 defer teardown ()
20352057
20362058 conn , err := db .Conn (ctx )
2037- defer conn .Close ()
2059+ defer func () {
2060+ if err := conn .Close (); err != nil {
2061+ t .Fatal (err )
2062+ }
2063+ }()
20382064 if err != nil {
20392065 t .Fatalf ("failed to get a connection: %v" , err )
20402066 }
@@ -2199,7 +2225,8 @@ func TestStressClientReuse(t *testing.T) {
21992225 _ , server , teardown := setupTestDBConnection (t )
22002226 defer teardown ()
22012227
2202- rand .Seed (time .Now ().UnixNano ())
2228+ rng := rand .New (rand .NewSource (time .Now ().UnixNano ()))
2229+
22032230 numSessions := 10
22042231 numClients := 5
22052232 numParallel := 50
@@ -2215,14 +2242,16 @@ func TestStressClientReuse(t *testing.T) {
22152242 }
22162243 // Execute random operations in parallel on the database.
22172244 for i := 0 ; i < numParallel ; i ++ {
2245+ doUpdate := rng .Int ()% 2 == 0
2246+
22182247 wg .Add (1 )
22192248 go func () {
22202249 defer wg .Done ()
22212250 conn , err := db .Conn (ctx )
22222251 if err != nil {
22232252 t .Errorf ("failed to get a connection: %v" , err )
22242253 }
2225- if rand . Int () % 2 == 0 {
2254+ if doUpdate {
22262255 if _ , err := conn .ExecContext (ctx , testutil .UpdateBarSetFoo ); err != nil {
22272256 t .Errorf ("failed to execute update on connection: %v" , err )
22282257 }
@@ -2262,7 +2291,11 @@ func TestExcludeTxnFromChangeStreams_AutoCommitUpdate(t *testing.T) {
22622291 defer teardown ()
22632292
22642293 conn , err := db .Conn (ctx )
2265- defer conn .Close ()
2294+ defer func () {
2295+ if err := conn .Close (); err != nil {
2296+ t .Fatal (err )
2297+ }
2298+ }()
22662299 if err != nil {
22672300 t .Fatalf ("failed to get a connection: %v" , err )
22682301 }
@@ -2306,7 +2339,11 @@ func TestExcludeTxnFromChangeStreams_AutoCommitBatchDml(t *testing.T) {
23062339 defer teardown ()
23072340
23082341 conn , err := db .Conn (ctx )
2309- defer conn .Close ()
2342+ defer func () {
2343+ if err := conn .Close (); err != nil {
2344+ t .Fatal (err )
2345+ }
2346+ }()
23102347 if err != nil {
23112348 t .Fatalf ("failed to get a connection: %v" , err )
23122349 }
@@ -2341,7 +2378,11 @@ func TestExcludeTxnFromChangeStreams_PartitionedDml(t *testing.T) {
23412378 defer teardown ()
23422379
23432380 conn , err := db .Conn (ctx )
2344- defer conn .Close ()
2381+ defer func () {
2382+ if err := conn .Close (); err != nil {
2383+ t .Fatal (err )
2384+ }
2385+ }()
23452386 if err != nil {
23462387 t .Fatalf ("failed to get a connection: %v" , err )
23472388 }
@@ -2368,7 +2409,11 @@ func TestExcludeTxnFromChangeStreams_Transaction(t *testing.T) {
23682409 defer teardown ()
23692410
23702411 conn , err := db .Conn (ctx )
2371- defer conn .Close ()
2412+ defer func () {
2413+ if err := conn .Close (); err != nil {
2414+ t .Fatal (err )
2415+ }
2416+ }()
23722417 if err != nil {
23732418 t .Fatalf ("failed to get a connection: %v" , err )
23742419 }
0 commit comments