From ea010358e3b4ad54fcc4377d550701199266c598 Mon Sep 17 00:00:00 2001 From: Hugo Dutka Date: Fri, 10 Jan 2025 11:18:37 +0000 Subject: [PATCH 1/4] remove custom wait durations for windows tests --- testutil/duration_windows.go | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 testutil/duration_windows.go diff --git a/testutil/duration_windows.go b/testutil/duration_windows.go deleted file mode 100644 index d363dae2ba596..0000000000000 --- a/testutil/duration_windows.go +++ /dev/null @@ -1,24 +0,0 @@ -package testutil - -import "time" - -// Constants for timing out operations, usable for creating contexts -// that timeout or in require.Eventually. -// -// Windows durations are adjusted for slow CI workers. -const ( - WaitShort = 30 * time.Second - WaitMedium = 40 * time.Second - WaitLong = 70 * time.Second - WaitSuperLong = 240 * time.Second -) - -// Constants for delaying repeated operations, e.g. in -// require.Eventually. -// -// Windows durations are adjusted for slow CI workers. -const ( - IntervalFast = 100 * time.Millisecond - IntervalMedium = 1000 * time.Millisecond - IntervalSlow = 4 * time.Second -) From d9741b89b48294762b35a7ba3e1353bf89e811e1 Mon Sep 17 00:00:00 2001 From: Hugo Dutka Date: Fri, 10 Jan 2025 11:27:27 +0000 Subject: [PATCH 2/4] remove Windows build constraint from duration.go --- testutil/duration.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/testutil/duration.go b/testutil/duration.go index 44ae418eba74f..a8c35030cdea2 100644 --- a/testutil/duration.go +++ b/testutil/duration.go @@ -1,5 +1,3 @@ -//go:build !windows - package testutil import ( From 3fa3ea63ba9a7d4b3bc4255cb0d4aeea04c6f1a2 Mon Sep 17 00:00:00 2001 From: Hugo Dutka Date: Fri, 10 Jan 2025 11:47:25 +0000 Subject: [PATCH 3/4] reduce test parallelism on windows --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e5180b037a916..e3076d790a132 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -445,7 +445,7 @@ jobs: # C: drive is extremely slow: https://github.com/actions/runner-images/issues/8755 mkdir -p "R:/temp/embedded-pg" go run scripts/embedded-pg/main.go -path "R:/temp/embedded-pg" - DB=ci gotestsum --format standard-quiet -- -v -short -count=1 ./... + DB=ci gotestsum --format standard-quiet -- -v -short -count=1 -parallel 4 -p 4 ./... else go run scripts/embedded-pg/main.go DB=ci gotestsum --format standard-quiet -- -v -short -count=1 ./... From 5577757769ee31878fd658aed2afc7409dbee6d0 Mon Sep 17 00:00:00 2001 From: Hugo Dutka Date: Fri, 10 Jan 2025 13:25:17 +0000 Subject: [PATCH 4/4] add a comment --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e3076d790a132..5492a2354ede6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -445,6 +445,9 @@ jobs: # C: drive is extremely slow: https://github.com/actions/runner-images/issues/8755 mkdir -p "R:/temp/embedded-pg" go run scripts/embedded-pg/main.go -path "R:/temp/embedded-pg" + # Reduce test parallelism, mirroring what we do for race tests. + # We'd been encountering issues with timing related flakes, and + # this seems to help. DB=ci gotestsum --format standard-quiet -- -v -short -count=1 -parallel 4 -p 4 ./... else go run scripts/embedded-pg/main.go