{control/controlhttp,derp/derphttp}: restore websocket dependency tests

This is a partial revert of commit 6d6f69e7358f.

Instead of ruling out the websocket dependency for all build targets, do so
specifically for iOS, where the concern is to avoid unduly increasing the size
of the target binary.  Since there is no way on iOS to get access to the debug
services that use websockets, we already disable the dependendency on iOS
anyway.

Updates #15160

Change-Id: I2fb3d9aafaaca8d1037fe9dea3462e85b8bc1e27
Signed-off-by: M. J. Fromberger <fromberger@tailscale.com>
This commit is contained in:
M. J. Fromberger 2025-04-17 08:22:39 -07:00
parent 0f4f808e70
commit 4a88aaec3a
2 changed files with 33 additions and 0 deletions

View File

@ -32,6 +32,7 @@ import (
"tailscale.com/net/tsdial" "tailscale.com/net/tsdial"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
"tailscale.com/tstest" "tailscale.com/tstest"
"tailscale.com/tstest/deptest"
"tailscale.com/tstime" "tailscale.com/tstime"
"tailscale.com/types/key" "tailscale.com/types/key"
"tailscale.com/types/logger" "tailscale.com/types/logger"
@ -821,3 +822,13 @@ func (c *closeTrackConn) Close() error {
c.d.noteClose(c) c.d.noteClose(c)
return c.Conn.Close() return c.Conn.Close()
} }
func TestDeps(t *testing.T) {
deptest.DepChecker{
GOOS: "ios",
GOARCH: "arm64",
BadDeps: map[string]string{
"github.com/coder/websocket": "controlhttp client shouldn't link websockets on iOS",
},
}.Check(t)
}

View File

@ -17,7 +17,9 @@ import (
"tailscale.com/derp" "tailscale.com/derp"
"tailscale.com/net/netmon" "tailscale.com/net/netmon"
"tailscale.com/tstest/deptest"
"tailscale.com/types/key" "tailscale.com/types/key"
"tailscale.com/util/set"
) )
func TestSendRecv(t *testing.T) { func TestSendRecv(t *testing.T) {
@ -485,3 +487,23 @@ func TestProbe(t *testing.T) {
} }
} }
} }
func TestDeps(t *testing.T) {
deptest.DepChecker{
GOOS: "ios",
GOARCH: "arm64",
BadDeps: map[string]string{
"github.com/coder/websocket": "derphttp client shouldn't link websockets on iOS",
},
}.Check(t)
deptest.DepChecker{
GOOS: "darwin",
GOARCH: "arm64",
Tags: "ts_debug_websockets",
WantDeps: set.Of(
"github.com/coder/websocket",
),
}.Check(t)
}