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

spikecurtis · web-flow · commit bf0271fd65ca · 2025-07-08T15:56:22.000+04:00
Fixes coder/internal#695 PostgreSQL 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.
diff --git a/coderd/database/db_test.go b/coderd/database/db_test.go
@@ -85,6 +85,10 @@ func TestNestedInTx(t *testing.T) {
 func testSQLDB(t testing.TB) *sql.DB {
 	t.Helper()
 
+	if !dbtestutil.WillUsePostgres() {
+		t.Skip("this test requires postgres")
+	}
+
 	connection, err := dbtestutil.Open(t)
 	require.NoError(t, err)
 
diff --git a/coderd/database/dbtestutil/postgres.go b/coderd/database/dbtestutil/postgres.go
@@ -81,7 +81,7 @@ func initDefaultConnection(t TBSubset) error {
 	}
 
 	var dbErr error
-	// Retry up to 3 seconds for temporary errors.
+	// Retry up to 10 seconds for temporary errors.
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 	for r := retry.New(10*time.Millisecond, 500*time.Millisecond); r.Wait(ctx); {
@@ -93,7 +93,7 @@ func initDefaultConnection(t TBSubset) error {
 		if !containsAnySubstring(errString, retryableErrSubstrings) {
 			break
 		}
-		t.Logf("failed to connect to postgres, retrying: %s", errString)
+		t.Logf("%s failed to connect to postgres, retrying: %s", time.Now().Format(time.StampMilli), errString)
 	}
 
 	// After the loop dbErr is the last connection error (if any).

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`	`var dbErr error`
`84`		`- // Retry up to 3 seconds for temporary errors.`
	`84`	`+ // Retry up to 10 seconds for temporary errors.`
`85`	`85`	`ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)`
`86`	`86`	`defer cancel()`
`87`	`87`	`for r := 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("%s failed 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).`