From 9ab992e7a184d2b3f929041f072704fe7e38c6e4 Mon Sep 17 00:00:00 2001 From: Denton Gentry Date: Sat, 27 Aug 2022 11:16:43 -0700 Subject: [PATCH] syncs: re-enable TestWatchMultipleValues We've updated to a different set of CI machines since this test was disabled. Fixes https://github.com/tailscale/tailscale/issues/1513 Signed-off-by: Denton Gentry --- syncs/watchdog_test.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/syncs/watchdog_test.go b/syncs/watchdog_test.go index 11c51337a..1292b93ec 100644 --- a/syncs/watchdog_test.go +++ b/syncs/watchdog_test.go @@ -8,8 +8,6 @@ import ( "sync" "testing" "time" - - "tailscale.com/util/cibuild" ) // Time-based tests are fundamentally flaky. @@ -47,12 +45,6 @@ func TestWatchContended(t *testing.T) { } func TestWatchMultipleValues(t *testing.T) { - if cibuild.On() { - // On the CI machine, it sometimes takes 500ms to start a new goroutine. - // When this happens, we don't get enough events quickly enough. - // Nothing's wrong, and it's not worth working around. Just skip the test. - t.Skip("flaky on CI") - } mu := new(sync.Mutex) ctx, cancel := context.WithCancel(context.Background()) defer cancel() // not necessary, but keep vet happy