Skip to content

Commit 61dd266

Browse files
committed
tsnet: remove flaky test marker from metrics
Updates tailscale#13420 Signed-off-by: Kristoffer Dalby <[email protected]>
1 parent caba123 commit 61dd266

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tsnet/tsnet_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -943,14 +943,14 @@ func sendData(logf func(format string, args ...any), ctx context.Context, bytesC
943943
}
944944

945945
func TestUserMetricsByteCounters(t *testing.T) {
946-
flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/13420")
947-
tstest.ResourceCheck(t)
948946
ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
949947
defer cancel()
950948

951949
controlURL, _ := startControl(t)
952950
s1, s1ip, _ := startServer(t, ctx, controlURL, "s1")
951+
defer s1.Close()
953952
s2, s2ip, _ := startServer(t, ctx, controlURL, "s2")
953+
defer s2.Close()
954954

955955
lc1, err := s1.LocalClient()
956956
if err != nil {
@@ -1063,14 +1063,14 @@ func TestUserMetricsRouteGauges(t *testing.T) {
10631063
if runtime.GOOS == "windows" {
10641064
t.Skipf("skipping on windows")
10651065
}
1066-
flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/13420")
1067-
tstest.ResourceCheck(t)
10681066
ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
10691067
defer cancel()
10701068

10711069
controlURL, c := startControl(t)
10721070
s1, _, s1PubKey := startServer(t, ctx, controlURL, "s1")
1071+
defer s1.Close()
10731072
s2, _, _ := startServer(t, ctx, controlURL, "s2")
1073+
defer s2.Close()
10741074

10751075
s1.lb.EditPrefs(&ipn.MaskedPrefs{
10761076
Prefs: ipn.Prefs{

0 commit comments

Comments
 (0)