Skip to content

Commit b5a625c

Browse files
committed
Fix all nested errors with constant comparisons using the errors.Is function applied in the previous commit
1 parent 75e714e commit b5a625c

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

flow/e2e/api_test.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func (s APITestSuite) checkMigrationCompleted(
8282
migrationName,
8383
).Scan(&completed)
8484
if err != nil {
85-
if err == pgx.ErrNoRows {
85+
if errors.Is(err, pgx.ErrNoRows) {
8686
// Migration record doesn't exist, so it hasn't been completed
8787
return false, nil
8888
}
@@ -1581,15 +1581,17 @@ func (s APITestSuite) TestDropCompletedAndUnavailable() {
15811581
require.NoError(s.t, err)
15821582
EnvWaitFor(s.t, env, time.Minute, "wait for avro stage dropped", func() bool {
15831583
var workflowID string
1584-
return s.catalog.QueryRow(
1584+
err := s.catalog.QueryRow(
15851585
s.t.Context(), "SELECT avro_file FROM ch_s3_stage WHERE flow_job_name = $1", flowConnConfig.FlowJobName,
1586-
).Scan(&workflowID) == pgx.ErrNoRows
1586+
).Scan(&workflowID)
1587+
return errors.Is(err, pgx.ErrNoRows)
15871588
})
15881589
EnvWaitFor(s.t, env, time.Minute, "wait for flow dropped", func() bool {
15891590
var workflowID string
1590-
return s.catalog.QueryRow(
1591+
err := s.catalog.QueryRow(
15911592
s.t.Context(), "select workflow_id from flows where name = $1", flowConnConfig.FlowJobName,
1592-
).Scan(&workflowID) == pgx.ErrNoRows
1593+
).Scan(&workflowID)
1594+
return errors.Is(err, pgx.ErrNoRows)
15931595
})
15941596
}
15951597

@@ -2202,9 +2204,10 @@ func (s APITestSuite) TestDropQRep() {
22022204
require.NoError(s.t, err)
22032205
EnvWaitFor(s.t, env, 3*time.Minute, "wait for qrep flow dropped", func() bool {
22042206
var workflowID string
2205-
return s.catalog.QueryRow(
2207+
err := s.catalog.QueryRow(
22062208
s.t.Context(), "select workflow_id from flows where name = $1", qrepConfig.FlowJobName,
2207-
).Scan(&workflowID) == pgx.ErrNoRows
2209+
).Scan(&workflowID)
2210+
return errors.Is(err, pgx.ErrNoRows)
22082211
})
22092212
}
22102213

0 commit comments

Comments
 (0)