Skip to content

Commit 7715ca3

Browse files
apocelipesgopherbot
authored andcommitted
database/sql: use t.Context in tests
Replace "context.WithCancel(context.Background())" with "t.Context()". Updates #36532 Change-Id: I78a8ba422f076f4c697910922cf6dc35c628b1a7 GitHub-Last-Rev: 2eacdbe GitHub-Pull-Request: #71599 Reviewed-on: https://go-review.googlesource.com/c/go/+/647555 Reviewed-by: Jorropo <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Auto-Submit: Ian Lance Taylor <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Reviewed-by: Cherry Mui <[email protected]>
1 parent 6fd3ce5 commit 7715ca3

File tree

1 file changed

+10
-22
lines changed

1 file changed

+10
-22
lines changed

Diff for: src/database/sql/sql_test.go

+10-22
Original file line numberDiff line numberDiff line change
@@ -1374,8 +1374,7 @@ func TestConnQuery(t *testing.T) {
13741374
db := newTestDB(t, "people")
13751375
defer closeDB(t, db)
13761376

1377-
ctx, cancel := context.WithCancel(context.Background())
1378-
defer cancel()
1377+
ctx := t.Context()
13791378
conn, err := db.Conn(ctx)
13801379
if err != nil {
13811380
t.Fatal(err)
@@ -1402,8 +1401,7 @@ func TestConnRaw(t *testing.T) {
14021401
db := newTestDB(t, "people")
14031402
defer closeDB(t, db)
14041403

1405-
ctx, cancel := context.WithCancel(context.Background())
1406-
defer cancel()
1404+
ctx := t.Context()
14071405
conn, err := db.Conn(ctx)
14081406
if err != nil {
14091407
t.Fatal(err)
@@ -1518,8 +1516,7 @@ func TestInvalidNilValues(t *testing.T) {
15181516
db := newTestDB(t, "people")
15191517
defer closeDB(t, db)
15201518

1521-
ctx, cancel := context.WithCancel(context.Background())
1522-
defer cancel()
1519+
ctx := t.Context()
15231520
conn, err := db.Conn(ctx)
15241521
if err != nil {
15251522
t.Fatal(err)
@@ -1547,8 +1544,7 @@ func TestConnTx(t *testing.T) {
15471544
db := newTestDB(t, "people")
15481545
defer closeDB(t, db)
15491546

1550-
ctx, cancel := context.WithCancel(context.Background())
1551-
defer cancel()
1547+
ctx := t.Context()
15521548
conn, err := db.Conn(ctx)
15531549
if err != nil {
15541550
t.Fatal(err)
@@ -2793,8 +2789,7 @@ func TestManyErrBadConn(t *testing.T) {
27932789
// Conn
27942790
db = manyErrBadConnSetup()
27952791
defer closeDB(t, db)
2796-
ctx, cancel := context.WithCancel(context.Background())
2797-
defer cancel()
2792+
ctx := t.Context()
27982793
conn, err := db.Conn(ctx)
27992794
if err != nil {
28002795
t.Fatal(err)
@@ -2935,8 +2930,7 @@ func TestConnExpiresFreshOutOfPool(t *testing.T) {
29352930
}
29362931
defer func() { nowFunc = time.Now }()
29372932

2938-
ctx, cancel := context.WithCancel(context.Background())
2939-
defer cancel()
2933+
ctx := t.Context()
29402934

29412935
db := newTestDB(t, "magicquery")
29422936
defer closeDB(t, db)
@@ -3786,8 +3780,7 @@ func TestIssue20647(t *testing.T) {
37863780
db := newTestDB(t, "people")
37873781
defer closeDB(t, db)
37883782

3789-
ctx, cancel := context.WithCancel(context.Background())
3790-
defer cancel()
3783+
ctx := t.Context()
37913784

37923785
conn, err := db.Conn(ctx)
37933786
if err != nil {
@@ -4142,9 +4135,7 @@ func TestNamedValueChecker(t *testing.T) {
41424135
}
41434136
defer db.Close()
41444137

4145-
ctx, cancel := context.WithCancel(context.Background())
4146-
defer cancel()
4147-
4138+
ctx := t.Context()
41484139
_, err = db.ExecContext(ctx, "WIPE")
41494140
if err != nil {
41504141
t.Fatal("exec wipe", err)
@@ -4192,9 +4183,7 @@ func TestNamedValueCheckerSkip(t *testing.T) {
41924183
}
41934184
defer db.Close()
41944185

4195-
ctx, cancel := context.WithCancel(context.Background())
4196-
defer cancel()
4197-
4186+
ctx := t.Context()
41984187
_, err = db.ExecContext(ctx, "WIPE")
41994188
if err != nil {
42004189
t.Fatal("exec wipe", err)
@@ -4305,8 +4294,7 @@ func TestQueryExecContextOnly(t *testing.T) {
43054294
}
43064295
defer db.Close()
43074296

4308-
ctx, cancel := context.WithCancel(context.Background())
4309-
defer cancel()
4297+
ctx := t.Context()
43104298

43114299
conn, err := db.Conn(ctx)
43124300
if err != nil {

0 commit comments

Comments
 (0)