summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--tsnet/tsnet_test.go7
-rw-r--r--wgengine/magicsock/magicsock_test.go4
2 files changed, 11 insertions, 0 deletions
diff --git a/tsnet/tsnet_test.go b/tsnet/tsnet_test.go
index 5ee205efd..0aae2205a 100644
--- a/tsnet/tsnet_test.go
+++ b/tsnet/tsnet_test.go
@@ -44,6 +44,7 @@ import (
"golang.org/x/net/proxy"
"tailscale.com/client/local"
+ "tailscale.com/cmd/testwrapper/flakytest"
"tailscale.com/internal/client/tailscale"
"tailscale.com/ipn"
"tailscale.com/ipn/ipnlocal"
@@ -518,6 +519,9 @@ func TestConn(t *testing.T) {
}
func TestLoopbackLocalAPI(t *testing.T) {
+ if runtime.GOOS == "darwin" {
+ flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/8557")
+ }
tstest.Shard(t)
tstest.ResourceCheck(t)
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
@@ -593,6 +597,9 @@ func TestLoopbackLocalAPI(t *testing.T) {
}
func TestLoopbackSOCKS5(t *testing.T) {
+ if runtime.GOOS == "darwin" {
+ flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/8198")
+ }
tstest.Shard(t)
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
diff --git a/wgengine/magicsock/magicsock_test.go b/wgengine/magicsock/magicsock_test.go
index 3038803c8..84f22a47a 100644
--- a/wgengine/magicsock/magicsock_test.go
+++ b/wgengine/magicsock/magicsock_test.go
@@ -39,6 +39,7 @@ import (
"go4.org/mem"
"golang.org/x/net/icmp"
"golang.org/x/net/ipv4"
+ "tailscale.com/cmd/testwrapper/flakytest"
"tailscale.com/control/controlknobs"
"tailscale.com/derp/derpserver"
"tailscale.com/disco"
@@ -739,6 +740,9 @@ func (localhostListener) ListenPacket(ctx context.Context, network, address stri
}
func TestTwoDevicePing(t *testing.T) {
+ if runtime.GOOS == "darwin" {
+ flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/11762")
+ }
ln, ip := localhostListener{}, netaddr.IPv4(127, 0, 0, 1)
n := &devices{
m1: ln,