Skip to content

Commit 20f17d6

Browse files
committed
wgengine/magicsock: reenable magicsock tests on Windows
These tests are passing locally and on CI. They had failed earlier in the day when first fixing up CI, and it is not immediately clear why. I have cycled IPv6 support locally, but this should not have a substantial effect. Updates tailscale#7876 Signed-off-by: James Tucker <[email protected]>
1 parent bd0c32c commit 20f17d6

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

wgengine/magicsock/magicsock_test.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,6 @@ type magicStack struct {
150150
// friends. You need to call conn.SetNetworkMap and dev.Reconfig
151151
// before anything interesting happens.
152152
func newMagicStack(t testing.TB, logf logger.Logf, l nettype.PacketListener, derpMap *tailcfg.DERPMap) *magicStack {
153-
if runtime.GOOS == "windows" {
154-
t.Skip("TODO(#7876): test regressed on windows while CI was broken")
155-
}
156153
privateKey := key.NewNode()
157154
return newMagicStackWithKey(t, logf, l, derpMap, privateKey)
158155
}
@@ -346,9 +343,6 @@ func meshStacks(logf logger.Logf, mutateNetmap func(idx int, nm *netmap.NetworkM
346343
}
347344

348345
func TestNewConn(t *testing.T) {
349-
if runtime.GOOS == "windows" {
350-
t.Skip("TODO(#7876): test regressed on windows while CI was broken")
351-
}
352346
tstest.PanicOnLog()
353347
tstest.ResourceCheck(t)
354348

@@ -627,9 +621,6 @@ func TestTwoDevicePing(t *testing.T) {
627621
}
628622

629623
func TestDiscokeyChange(t *testing.T) {
630-
if runtime.GOOS == "windows" {
631-
t.Skip("TODO(#7876): test regressed on windows while CI was broken")
632-
}
633624
tstest.PanicOnLog()
634625
tstest.ResourceCheck(t)
635626

@@ -697,9 +688,6 @@ func TestDiscokeyChange(t *testing.T) {
697688
}
698689

699690
func TestActiveDiscovery(t *testing.T) {
700-
if runtime.GOOS == "windows" {
701-
t.Skip("TODO(#7876): test regressed on windows while CI was broken")
702-
}
703691
t.Run("simple_internet", func(t *testing.T) {
704692
t.Parallel()
705693
mstun := &natlab.Machine{Name: "stun"}
@@ -2170,9 +2158,6 @@ func newWireguard(t *testing.T, uapi string, aips []netip.Prefix) (*device.Devic
21702158
}
21712159

21722160
func TestIsWireGuardOnlyPeer(t *testing.T) {
2173-
if runtime.GOOS == "windows" {
2174-
t.Skip("TODO(#7876): test regressed on windows while CI was broken")
2175-
}
21762161
derpMap, cleanup := runDERPAndStun(t, t.Logf, localhostListener{}, netaddr.IPv4(127, 0, 0, 1))
21772162
defer cleanup()
21782163

@@ -2227,9 +2212,6 @@ func TestIsWireGuardOnlyPeer(t *testing.T) {
22272212
}
22282213

22292214
func TestIsWireGuardOnlyPeerWithMasquerade(t *testing.T) {
2230-
if runtime.GOOS == "windows" {
2231-
t.Skip("TODO(#7876): test regressed on windows while CI was broken")
2232-
}
22332215
derpMap, cleanup := runDERPAndStun(t, t.Logf, localhostListener{}, netaddr.IPv4(127, 0, 0, 1))
22342216
defer cleanup()
22352217

0 commit comments

Comments
 (0)