@@ -1374,8 +1374,7 @@ func TestConnQuery(t *testing.T) {
1374
1374
db := newTestDB (t , "people" )
1375
1375
defer closeDB (t , db )
1376
1376
1377
- ctx , cancel := context .WithCancel (context .Background ())
1378
- defer cancel ()
1377
+ ctx := t .Context ()
1379
1378
conn , err := db .Conn (ctx )
1380
1379
if err != nil {
1381
1380
t .Fatal (err )
@@ -1402,8 +1401,7 @@ func TestConnRaw(t *testing.T) {
1402
1401
db := newTestDB (t , "people" )
1403
1402
defer closeDB (t , db )
1404
1403
1405
- ctx , cancel := context .WithCancel (context .Background ())
1406
- defer cancel ()
1404
+ ctx := t .Context ()
1407
1405
conn , err := db .Conn (ctx )
1408
1406
if err != nil {
1409
1407
t .Fatal (err )
@@ -1518,8 +1516,7 @@ func TestInvalidNilValues(t *testing.T) {
1518
1516
db := newTestDB (t , "people" )
1519
1517
defer closeDB (t , db )
1520
1518
1521
- ctx , cancel := context .WithCancel (context .Background ())
1522
- defer cancel ()
1519
+ ctx := t .Context ()
1523
1520
conn , err := db .Conn (ctx )
1524
1521
if err != nil {
1525
1522
t .Fatal (err )
@@ -1547,8 +1544,7 @@ func TestConnTx(t *testing.T) {
1547
1544
db := newTestDB (t , "people" )
1548
1545
defer closeDB (t , db )
1549
1546
1550
- ctx , cancel := context .WithCancel (context .Background ())
1551
- defer cancel ()
1547
+ ctx := t .Context ()
1552
1548
conn , err := db .Conn (ctx )
1553
1549
if err != nil {
1554
1550
t .Fatal (err )
@@ -2793,8 +2789,7 @@ func TestManyErrBadConn(t *testing.T) {
2793
2789
// Conn
2794
2790
db = manyErrBadConnSetup ()
2795
2791
defer closeDB (t , db )
2796
- ctx , cancel := context .WithCancel (context .Background ())
2797
- defer cancel ()
2792
+ ctx := t .Context ()
2798
2793
conn , err := db .Conn (ctx )
2799
2794
if err != nil {
2800
2795
t .Fatal (err )
@@ -2935,8 +2930,7 @@ func TestConnExpiresFreshOutOfPool(t *testing.T) {
2935
2930
}
2936
2931
defer func () { nowFunc = time .Now }()
2937
2932
2938
- ctx , cancel := context .WithCancel (context .Background ())
2939
- defer cancel ()
2933
+ ctx := t .Context ()
2940
2934
2941
2935
db := newTestDB (t , "magicquery" )
2942
2936
defer closeDB (t , db )
@@ -3786,8 +3780,7 @@ func TestIssue20647(t *testing.T) {
3786
3780
db := newTestDB (t , "people" )
3787
3781
defer closeDB (t , db )
3788
3782
3789
- ctx , cancel := context .WithCancel (context .Background ())
3790
- defer cancel ()
3783
+ ctx := t .Context ()
3791
3784
3792
3785
conn , err := db .Conn (ctx )
3793
3786
if err != nil {
@@ -4142,9 +4135,7 @@ func TestNamedValueChecker(t *testing.T) {
4142
4135
}
4143
4136
defer db .Close ()
4144
4137
4145
- ctx , cancel := context .WithCancel (context .Background ())
4146
- defer cancel ()
4147
-
4138
+ ctx := t .Context ()
4148
4139
_ , err = db .ExecContext (ctx , "WIPE" )
4149
4140
if err != nil {
4150
4141
t .Fatal ("exec wipe" , err )
@@ -4192,9 +4183,7 @@ func TestNamedValueCheckerSkip(t *testing.T) {
4192
4183
}
4193
4184
defer db .Close ()
4194
4185
4195
- ctx , cancel := context .WithCancel (context .Background ())
4196
- defer cancel ()
4197
-
4186
+ ctx := t .Context ()
4198
4187
_ , err = db .ExecContext (ctx , "WIPE" )
4199
4188
if err != nil {
4200
4189
t .Fatal ("exec wipe" , err )
@@ -4305,8 +4294,7 @@ func TestQueryExecContextOnly(t *testing.T) {
4305
4294
}
4306
4295
defer db .Close ()
4307
4296
4308
- ctx , cancel := context .WithCancel (context .Background ())
4309
- defer cancel ()
4297
+ ctx := t .Context ()
4310
4298
4311
4299
conn , err := db .Conn (ctx )
4312
4300
if err != nil {
0 commit comments