Skip to content

Commit 51e67c3

Browse files
Copilotasmyasnikov
andauthored
Fix flaky TestBasicExampleQuery by handling context cancellation (#1907)
Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: asmyasnikov <[email protected]>
1 parent fda5a9d commit 51e67c3

File tree

1 file changed

+37
-21
lines changed

1 file changed

+37
-21
lines changed

tests/integration/basic_example_query_test.go

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,9 @@ func TestBasicExampleQuery(sourceTest *testing.T) { //nolint:gocyclo
144144
PRIMARY KEY(series_id)
145145
)`,
146146
)
147-
require.NoError(t, err)
147+
if ctx.Err() == nil {
148+
require.NoError(t, err)
149+
}
148150
})
149151
t.Run("seasons", func(t *testing.T) {
150152
err := db.Query().Exec(ctx, `
@@ -162,7 +164,9 @@ func TestBasicExampleQuery(sourceTest *testing.T) { //nolint:gocyclo
162164
PRIMARY KEY(series_id,season_id)
163165
)`,
164166
)
165-
require.NoError(t, err)
167+
if ctx.Err() == nil {
168+
require.NoError(t, err)
169+
}
166170
})
167171
t.Run("episodes", func(t *testing.T) {
168172
err := db.Query().Exec(ctx, `
@@ -181,7 +185,9 @@ func TestBasicExampleQuery(sourceTest *testing.T) { //nolint:gocyclo
181185
PRIMARY KEY(series_id,season_id,episode_id)
182186
)`,
183187
)
184-
require.NoError(t, err)
188+
if ctx.Err() == nil {
189+
require.NoError(t, err)
190+
}
185191
})
186192
})
187193
})
@@ -246,7 +252,9 @@ func TestBasicExampleQuery(sourceTest *testing.T) { //nolint:gocyclo
246252
),
247253
query.WithIdempotent(),
248254
)
249-
require.NoError(t, err)
255+
if ctx.Err() == nil {
256+
require.NoError(t, err)
257+
}
250258
})
251259
})
252260

@@ -310,7 +318,9 @@ func TestBasicExampleQuery(sourceTest *testing.T) { //nolint:gocyclo
310318
},
311319
query.WithIdempotent(),
312320
)
313-
require.NoError(t, err)
321+
if ctx.Err() == nil {
322+
require.NoError(t, err)
323+
}
314324
})
315325
})
316326

@@ -338,10 +348,12 @@ func TestBasicExampleQuery(sourceTest *testing.T) { //nolint:gocyclo
338348
Build(),
339349
),
340350
)
341-
require.NoError(t, err)
342-
var views uint64
343-
require.NoError(t, row.Scan(&views))
344-
require.EqualValues(t, 1, views)
351+
if ctx.Err() == nil {
352+
require.NoError(t, err)
353+
var views uint64
354+
require.NoError(t, row.Scan(&views))
355+
require.EqualValues(t, 1, views)
356+
}
345357
})
346358
})
347359

@@ -376,17 +388,19 @@ func TestBasicExampleQuery(sourceTest *testing.T) { //nolint:gocyclo
376388
query.WithParameters(ydb.ParamsBuilder().Param("$seriesID").Uint64(1).Build()),
377389
query.WithTxControl(query.SnapshotReadOnlyTxControl()),
378390
)
379-
require.NoError(t, err)
380-
var (
381-
id *uint64
382-
title *string
383-
date *time.Time
384-
)
385-
require.NoError(t, row.Scan(&id, &title, &date))
386-
t.Logf(
387-
" > %d %s %s\n",
388-
*id, *title, *date,
389-
)
391+
if ctx.Err() == nil {
392+
require.NoError(t, err)
393+
var (
394+
id *uint64
395+
title *string
396+
date *time.Time
397+
)
398+
require.NoError(t, row.Scan(&id, &title, &date))
399+
t.Logf(
400+
" > %d %s %s\n",
401+
*id, *title, *date,
402+
)
403+
}
390404
})
391405

392406
t.Run("ScanQuery", func(t *testing.T) {
@@ -438,6 +452,8 @@ func TestBasicExampleQuery(sourceTest *testing.T) { //nolint:gocyclo
438452

439453
return nil
440454
}, query.WithIdempotent())
441-
require.NoError(t, err)
455+
if ctx.Err() == nil {
456+
require.NoError(t, err)
457+
}
442458
})
443459
}

0 commit comments

Comments
 (0)