tstest/natlab/vmtest: skipe tests marked as flakey (#20122)

Flakeytest seems to not work on vmtest. We have a few PRs that will fix
the problem on these tests, so skip to unblock.

Updates #19843

Signed-off-by: Claus Lensbøl <claus@tailscale.com>
This commit is contained in:
Claus Lensbøl
2026-06-12 11:03:15 -04:00
committed by GitHub
parent 6f281ccbcd
commit 0108fb73a9
+11 -11
View File
@@ -14,7 +14,6 @@ import (
"time" "time"
"tailscale.com/client/local" "tailscale.com/client/local"
"tailscale.com/cmd/testwrapper/flakytest"
"tailscale.com/ipn" "tailscale.com/ipn"
"tailscale.com/net/udprelay/status" "tailscale.com/net/udprelay/status"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
@@ -1158,15 +1157,16 @@ func TestCachedNetmapAfterRestart(t *testing.T) {
// The test has two modes, pinging from the offline node to the online node, // The test has two modes, pinging from the offline node to the online node,
// and pinging from the online node to the offline node. // and pinging from the online node to the offline node.
// //
// TODO(cmol): The online -> offline test is flakey for now. The TSMP disco // TODO(cmol): The online -> offline test is skipped for now (as of 2026-06-12).
// key exchange currently relies on disco ping messages being sent. These will // The TSMP disco key exchange currently relies on disco ping messages being
// however not be sent if there is not endpoints on the online node which is // sent. These will however not be sent if there is not endpoints on the online
// possible in the event where a node has registered but not finished STUN. // node which is possible in the event where a node has registered but not
// finished STUN.
func TestDirectConnectionWithCachedNetmapOnOneNode(t *testing.T) { func TestDirectConnectionWithCachedNetmapOnOneNode(t *testing.T) {
for _, testPingFrom := range []string{"offline", "online"} { for _, testPingFrom := range []string{"offline", "online"} {
t.Run(fmt.Sprintf("ping_from_%s", testPingFrom), func(t *testing.T) { t.Run(fmt.Sprintf("ping_from_%s", testPingFrom), func(t *testing.T) {
if testPingFrom == "online" { if testPingFrom == "online" {
flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/19843") t.Skip("https://github.com/tailscale/tailscale/issues/19843")
} }
env := vmtest.New(t) env := vmtest.New(t)
@@ -1252,12 +1252,12 @@ func TestDirectConnectionWithCachedNetmapOnOneNode(t *testing.T) {
// WireGuard tunnel after both restarted while the control server is // WireGuard tunnel after both restarted while the control server is
// unreachable. After restart one node must use only its on-disk cached // unreachable. After restart one node must use only its on-disk cached
// netmaps to re-connect and ping the other node. // netmaps to re-connect and ping the other node.
// TODO(cmol): The test is flakey for now. The TSMP disco key exchange // TODO(cmol): The test is skipped for now (as of 2026-06-12). The TSMP disco
// currently relies on disco ping messages being sent. These will however not // key exchange currently relies on disco ping messages being sent. These will
// be sent if there is not endpoints on the online node which is possible in // however not be sent if there is not endpoints on the online node which is
// the event where a node has registered but not finished STUN. // possible in the event where a node has registered but not finished STUN.
func TestDirectConnectionWithCachedNetmapOnTwoNodes(t *testing.T) { func TestDirectConnectionWithCachedNetmapOnTwoNodes(t *testing.T) {
flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/19843") t.Skip("https://github.com/tailscale/tailscale/issues/19843")
env := vmtest.New(t) env := vmtest.New(t)
aNet := env.AddNetwork("1.0.0.1", "192.168.1.1/24", vnet.EasyNAT) aNet := env.AddNetwork("1.0.0.1", "192.168.1.1/24", vnet.EasyNAT)