From b74db24149b0d594486803b7fac02b78f1fd387c Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Mon, 23 Jan 2023 13:27:44 -0500 Subject: [PATCH] tstest/integration: mark all integration tests as flaky Updates #7036 Change-Id: I3aec5ad680078199ba984bf8afc20b2f2eb37257 Signed-off-by: Andrew Dunham --- cmd/testwrapper/flakytest/flakytest.go | 2 +- tstest/integration/integration_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/testwrapper/flakytest/flakytest.go b/cmd/testwrapper/flakytest/flakytest.go index c210f8027..2e0983d4a 100644 --- a/cmd/testwrapper/flakytest/flakytest.go +++ b/cmd/testwrapper/flakytest/flakytest.go @@ -26,7 +26,7 @@ var issueRegexp = regexp.MustCompile(`\Ahttps://github\.com/tailscale/[a-zA-Z0-9 // the status of the flaky test being marked, of the format: // // https://github.com/tailscale/myRepo-H3re/issues/12345 -func Mark(t *testing.T, issue string) { +func Mark(t testing.TB, issue string) { if !issueRegexp.MatchString(issue) { t.Fatalf("bad issue format: %q", issue) } diff --git a/tstest/integration/integration_test.go b/tstest/integration/integration_test.go index ecc918009..a10c7b9a6 100644 --- a/tstest/integration/integration_test.go +++ b/tstest/integration/integration_test.go @@ -591,6 +591,7 @@ func newTestEnv(t testing.TB, opts ...testEnvOpt) *testEnv { if runtime.GOOS == "windows" { t.Skip("not tested/working on Windows yet") } + flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/7036") derpMap := RunDERPAndSTUN(t, logger.Discard, "127.0.0.1") logc := new(LogCatcher) control := &testcontrol.Server{