NotificationsYou must be signed in to change notification settings
Fork948
Star10.4k

Commitbf0271f

authored

chore: stop running postgres-only tests if DB is not set (#18784)

Fixescoder/internal#695PostgreSQL tests are getting run in a non-postgres CI job because the tests don't get skipped if the `DB=` env is unset. This PR adds a skip for them.They are flaking in the `test-go-race` CI job. They run fine in the `test-go-race-pg` job, which pre-creates the postgres server, so the flakiness is almost certainly related to spinning up the database server.

1 parent211393a commitbf0271fCopy full SHA for bf0271f

File tree

2 files changed

-2

lines changed

coderd/database
- db_test.go
- dbtestutil
  - postgres.go

2 files changed

-2

lines changed

`‎coderd/database/db_test.go`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,10 @@ func TestNestedInTx(t *testing.T) {`
`85`	`85`	`functestSQLDB(t testing.TB)*sql.DB {`
`86`	`86`	`t.Helper()`
`87`	`87`
	`88`	`+if!dbtestutil.WillUsePostgres() {`
	`89`	`+t.Skip("this test requires postgres")`
	`90`	`+}`
	`91`	`+`
`88`	`92`	`connection,err:=dbtestutil.Open(t)`
`89`	`93`	`require.NoError(t,err)`
`90`	`94`

`‎coderd/database/dbtestutil/postgres.go`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func initDefaultConnection(t TBSubset) error {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`vardbErrerror`
`84`		`-// Retry up to3 seconds for temporary errors.`
	`84`	`+// Retry up to10 seconds for temporary errors.`
`85`	`85`	`ctx,cancel:=context.WithTimeout(context.Background(),10*time.Second)`
`86`	`86`	`defercancel()`
`87`	`87`	`forr:=retry.New(10time.Millisecond,500time.Millisecond);r.Wait(ctx); {`
`@@ -93,7 +93,7 @@ func initDefaultConnection(t TBSubset) error {`
`93`	`93`	`if!containsAnySubstring(errString,retryableErrSubstrings) {`
`94`	`94`	`break`
`95`	`95`	`}`
`96`		`-t.Logf("failed to connect to postgres, retrying: %s",errString)`
	`96`	`+t.Logf("%sfailed to connect to postgres, retrying: %s",time.Now().Format(time.StampMilli),errString)`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`// After the loop dbErr is the last connection error (if any).`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitbf0271f

File tree

2 files changed

2 files changed

`‎coderd/database/db_test.go`

`‎coderd/database/dbtestutil/postgres.go`

0 commit comments