From a0aaf2244cbd06c32a99e327d581f518fbc2a3d0 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Thu, 16 Nov 2023 12:15:28 -0500 Subject: [PATCH] Remove parallelization of PG tests and see if that fixes flakes --- internal/datastore/postgres/pgbouncer_test.go | 4 ---- internal/datastore/postgres/postgres_shared_test.go | 3 --- internal/datastore/postgres/postgres_test.go | 4 ---- 3 files changed, 11 deletions(-) diff --git a/internal/datastore/postgres/pgbouncer_test.go b/internal/datastore/postgres/pgbouncer_test.go index cf736f2f61..23958a3ee9 100644 --- a/internal/datastore/postgres/pgbouncer_test.go +++ b/internal/datastore/postgres/pgbouncer_test.go @@ -19,13 +19,9 @@ var pgbouncerConfigs = lo.Map( ) func TestPostgresWithPgBouncerDatastore(t *testing.T) { - t.Parallel() - testPostgresDatastore(t, pgbouncerConfigs) } func TestPostgresDatastoreWithPgBouncerWithoutCommitTimestamps(t *testing.T) { - t.Parallel() - testPostgresDatastoreWithoutCommitTimestamps(t, pgbouncerConfigs) } diff --git a/internal/datastore/postgres/postgres_shared_test.go b/internal/datastore/postgres/postgres_shared_test.go index ab7208ef89..9539fb055d 100644 --- a/internal/datastore/postgres/postgres_shared_test.go +++ b/internal/datastore/postgres/postgres_shared_test.go @@ -76,7 +76,6 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) { pgbouncerStr = "pgbouncer-" } t.Run(fmt.Sprintf("%spostgres-%s-%s-%s", pgbouncerStr, config.pgVersion, config.targetMigration, config.migrationPhase), func(t *testing.T) { - t.Parallel() b := testdatastore.RunPostgresForTesting(t, "", config.targetMigration, config.pgVersion, config.pgbouncer) test.All(t, test.DatastoreTesterFunc(func(revisionQuantization, gcInterval, gcWindow time.Duration, watchBufferLength uint16) (datastore.Datastore, error) { @@ -198,8 +197,6 @@ func testPostgresDatastoreWithoutCommitTimestamps(t *testing.T, pc []postgresCon pgVersion := config.pgVersion enablePgbouncer := config.pgbouncer t.Run(fmt.Sprintf("postgres-%s", pgVersion), func(t *testing.T) { - t.Parallel() - b := testdatastore.RunPostgresForTestingWithCommitTimestamps(t, "", "head", false, pgVersion, enablePgbouncer) // NOTE: watch API requires the commit timestamps, so we skip those tests here. diff --git a/internal/datastore/postgres/postgres_test.go b/internal/datastore/postgres/postgres_test.go index ab3057c1ef..1fd9146271 100644 --- a/internal/datastore/postgres/postgres_test.go +++ b/internal/datastore/postgres/postgres_test.go @@ -8,13 +8,9 @@ import ( ) func TestPostgresDatastore(t *testing.T) { - t.Parallel() - testPostgresDatastore(t, postgresConfigs) } func TestPostgresDatastoreWithoutCommitTimestamps(t *testing.T) { - t.Parallel() - testPostgresDatastoreWithoutCommitTimestamps(t, postgresConfigs) }