TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-05-22 15:28:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

tsnet: remove flaky test marker from metrics

Browse Source 
Updates #13420

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2024-11-28 12:45:40 +01:00 committed by Kristoffer Dalby
parent caba123008
commit 61dd2662ec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tsnet/tsnet_test.go
View File

@ -943,14 +943,14 @@ func sendData(logf func(format string, args ...any), ctx context.Context, bytesC
} }
func TestUserMetricsByteCounters(t *testing.T) { func TestUserMetricsByteCounters(t *testing.T) {
flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/13420")
tstest.ResourceCheck(t)
ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
defer cancel() defer cancel()
controlURL, _ := startControl(t) controlURL, _ := startControl(t)
s1, s1ip, _ := startServer(t, ctx, controlURL, "s1") s1, s1ip, _ := startServer(t, ctx, controlURL, "s1")
defer s1.Close()
s2, s2ip, _ := startServer(t, ctx, controlURL, "s2") s2, s2ip, _ := startServer(t, ctx, controlURL, "s2")
defer s2.Close()
lc1, err := s1.LocalClient() lc1, err := s1.LocalClient()
if err != nil { if err != nil {
@ -1063,14 +1063,14 @@ func TestUserMetricsRouteGauges(t *testing.T) {
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
t.Skipf("skipping on windows") t.Skipf("skipping on windows")
} }
flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/13420")
tstest.ResourceCheck(t)
ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
defer cancel() defer cancel()
controlURL, c := startControl(t) controlURL, c := startControl(t)
s1, _, s1PubKey := startServer(t, ctx, controlURL, "s1") s1, _, s1PubKey := startServer(t, ctx, controlURL, "s1")
defer s1.Close()
s2, _, _ := startServer(t, ctx, controlURL, "s2") s2, _, _ := startServer(t, ctx, controlURL, "s2")
defer s2.Close()
s1.lb.EditPrefs(&ipn.MaskedPrefs{ s1.lb.EditPrefs(&ipn.MaskedPrefs{
Prefs: ipn.Prefs{ Prefs: ipn.Prefs{