From 4fb663fbd2e3b2a34db8411f5ad5d67af51b60b3 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Thu, 19 Jan 2023 09:42:58 -0500 Subject: [PATCH] various: mark more tests as flaky Updates #2855 Updates #3598 Updates #7008 Signed-off-by: Andrew Dunham Change-Id: I2b849e04646456b9f0c8a01563f2add752f4b2a4 --- tstest/integration/integration_test.go | 3 +++ wgengine/userspace_test.go | 2 ++ 2 files changed, 5 insertions(+) diff --git a/tstest/integration/integration_test.go b/tstest/integration/integration_test.go index 21f8579b9..ecc918009 100644 --- a/tstest/integration/integration_test.go +++ b/tstest/integration/integration_test.go @@ -30,6 +30,7 @@ import ( "time" "go4.org/mem" + "tailscale.com/cmd/testwrapper/flakytest" "tailscale.com/ipn" "tailscale.com/ipn/ipnlocal" "tailscale.com/ipn/ipnstate" @@ -251,6 +252,7 @@ func TestOneNodeUpAuth(t *testing.T) { } func TestTwoNodes(t *testing.T) { + flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/3598") t.Parallel() env := newTestEnv(t) @@ -297,6 +299,7 @@ func TestTwoNodes(t *testing.T) { } func TestNodeAddressIPFields(t *testing.T) { + flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/7008") t.Parallel() env := newTestEnv(t) n1 := newTestNode(t, env) diff --git a/wgengine/userspace_test.go b/wgengine/userspace_test.go index f6ba3a96b..8a3ed1d93 100644 --- a/wgengine/userspace_test.go +++ b/wgengine/userspace_test.go @@ -11,6 +11,7 @@ import ( "testing" "go4.org/mem" + "tailscale.com/cmd/testwrapper/flakytest" "tailscale.com/net/dns" "tailscale.com/net/netaddr" "tailscale.com/net/tstun" @@ -143,6 +144,7 @@ func TestUserspaceEngineReconfig(t *testing.T) { } func TestUserspaceEnginePortReconfig(t *testing.T) { + flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/2855") const defaultPort = 49983 // Keep making a wgengine until we find an unused port var ue *userspaceEngine