TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-05-09 17:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

tstest/integration: export test helpers

Browse Source 
In prep for Taildrop integration tests using them from another package.

Updates #15812

Change-Id: I6a995de4e7400658229d99c90349ad5bd1f503ae
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2025-04-28 15:35:51 -07:00 committed by Brad Fitzpatrick
parent 81420f8944
commit ac1215c7e0
2 changed files with 107 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
tstest/integration/integration.go
View File

@ -386,9 +386,9 @@ func (lc *LogCatcher) ServeHTTP(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(200) // must have no content, but not a 204 w.WriteHeader(200) // must have no content, but not a 204
} }
// testEnv contains the test environment (set of servers) used by one // TestEnv contains the test environment (set of servers) used by one
// or more nodes. // or more nodes.
type testEnv struct { type TestEnv struct {
t testing.TB t testing.TB
tunMode bool tunMode bool
cli string cli string
@ -405,9 +405,9 @@ type testEnv struct {
TrafficTrapServer *httptest.Server TrafficTrapServer *httptest.Server
} }
// controlURL returns e.ControlServer.URL, panicking if it's the empty string, // ControlURL returns e.ControlServer.URL, panicking if it's the empty string,
// which it should never be in tests. // which it should never be in tests.
func (e *testEnv) controlURL() string { func (e *TestEnv) ControlURL() string {
s := e.ControlServer.URL s := e.ControlServer.URL
if s == "" { if s == "" {
panic("control server not set") panic("control server not set")
@ -415,19 +415,21 @@ func (e *testEnv) controlURL() string {
return s return s
} }
type testEnvOpt interface { // TestEnvOpt represents an option that can be passed to NewTestEnv.
modifyTestEnv(*testEnv) type TestEnvOpt interface {
ModifyTestEnv(*TestEnv)
} }
type configureControl func(*testcontrol.Server) // ConfigureControl is a test option that configures the test control server.
type ConfigureControl func(*testcontrol.Server)
func (f configureControl) modifyTestEnv(te *testEnv) { func (f ConfigureControl) ModifyTestEnv(te *TestEnv) {
f(te.Control) f(te.Control)
} }
// newTestEnv starts a bunch of services and returns a new test environment. // NewTestEnv starts a bunch of services and returns a new test environment.
// newTestEnv arranges for the environment's resources to be cleaned up on exit. // NewTestEnv arranges for the environment's resources to be cleaned up on exit.
func newTestEnv(t testing.TB, opts ...testEnvOpt) *testEnv { func NewTestEnv(t testing.TB, opts ...TestEnvOpt) *TestEnv {
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
t.Skip("not tested/working on Windows yet") t.Skip("not tested/working on Windows yet")
} }
@ -438,7 +440,7 @@ func newTestEnv(t testing.TB, opts ...testEnvOpt) *testEnv {
} }
control.HTTPTestServer = httptest.NewUnstartedServer(control) control.HTTPTestServer = httptest.NewUnstartedServer(control)
trafficTrap := new(trafficTrap) trafficTrap := new(trafficTrap)
e := &testEnv{ e := &TestEnv{
t: t, t: t,
cli: TailscaleBinary(t), cli: TailscaleBinary(t),
daemon: TailscaledBinary(t), daemon: TailscaledBinary(t),
@ -450,7 +452,7 @@ func newTestEnv(t testing.TB, opts ...testEnvOpt) *testEnv {
TrafficTrapServer: httptest.NewServer(trafficTrap), TrafficTrapServer: httptest.NewServer(trafficTrap),
} }
for _, o := range opts { for _, o := range opts {
o.modifyTestEnv(e) o.ModifyTestEnv(e)
} }
control.HTTPTestServer.Start() control.HTTPTestServer.Start()
t.Cleanup(func() { t.Cleanup(func() {
@ -463,15 +465,15 @@ func newTestEnv(t testing.TB, opts ...testEnvOpt) *testEnv {
e.TrafficTrapServer.Close() e.TrafficTrapServer.Close()
e.ControlServer.Close() e.ControlServer.Close()
}) })
t.Logf("control URL: %v", e.controlURL()) t.Logf("control URL: %v", e.ControlURL())
return e return e
} }
// testNode is a machine with a tailscale & tailscaled. // TestNode is a machine with a tailscale & tailscaled.
// Currently, the test is simplistic and user==node==machine. // Currently, the test is simplistic and user==node==machine.
// That may grow complexity later to test more. // That may grow complexity later to test more.
type testNode struct { type TestNode struct {
env *testEnv env *TestEnv
tailscaledParser *nodeOutputParser tailscaledParser *nodeOutputParser
dir string // temp dir for sock & state dir string // temp dir for sock & state
@ -484,9 +486,9 @@ type testNode struct {
onLogLine []func([]byte) onLogLine []func([]byte)
} }
// newTestNode allocates a temp directory for a new test node. // NewTestNode allocates a temp directory for a new test node.
// The node is not started automatically. // The node is not started automatically.
func newTestNode(t *testing.T, env *testEnv) *testNode { func NewTestNode(t *testing.T, env *TestEnv) *TestNode {
dir := t.TempDir() dir := t.TempDir()
sockFile := filepath.Join(dir, "tailscale.sock") sockFile := filepath.Join(dir, "tailscale.sock")
if len(sockFile) >= 104 { if len(sockFile) >= 104 {
@ -494,7 +496,7 @@ func newTestNode(t *testing.T, env *testEnv) *testNode {
sockFile = filepath.Join(os.TempDir(), rands.HexString(8)+".sock") sockFile = filepath.Join(os.TempDir(), rands.HexString(8)+".sock")
t.Cleanup(func() { os.Remove(sockFile) }) t.Cleanup(func() { os.Remove(sockFile) })
} }
n := &testNode{ n := &TestNode{
env: env, env: env,
dir: dir, dir: dir,
sockFile: sockFile, sockFile: sockFile,
@ -520,7 +522,7 @@ func newTestNode(t *testing.T, env *testEnv) *testNode {
return n return n
} }
func (n *testNode) diskPrefs() *ipn.Prefs { func (n *TestNode) diskPrefs() *ipn.Prefs {
t := n.env.t t := n.env.t
t.Helper() t.Helper()
if _, err := os.ReadFile(n.stateFile); err != nil { if _, err := os.ReadFile(n.stateFile); err != nil {
@ -539,7 +541,7 @@ func (n *testNode) diskPrefs() *ipn.Prefs {
// AwaitResponding waits for n's tailscaled to be up enough to be // AwaitResponding waits for n's tailscaled to be up enough to be
// responding, but doesn't wait for any particular state. // responding, but doesn't wait for any particular state.
func (n *testNode) AwaitResponding() { func (n *TestNode) AwaitResponding() {
t := n.env.t t := n.env.t
t.Helper() t.Helper()
n.AwaitListening() n.AwaitListening()
@ -560,7 +562,7 @@ func (n *testNode) AwaitResponding() {
// addLogLineHook registers a hook f to be called on each tailscaled // addLogLineHook registers a hook f to be called on each tailscaled
// log line output. // log line output.
func (n *testNode) addLogLineHook(f func([]byte)) { func (n *TestNode) addLogLineHook(f func([]byte)) {
n.mu.Lock() n.mu.Lock()
defer n.mu.Unlock() defer n.mu.Unlock()
n.onLogLine = append(n.onLogLine, f) n.onLogLine = append(n.onLogLine, f)
@ -568,7 +570,7 @@ func (n *testNode) addLogLineHook(f func([]byte)) {
// socks5AddrChan returns a channel that receives the address (e.g. "localhost:23874") // socks5AddrChan returns a channel that receives the address (e.g. "localhost:23874")
// of the node's SOCKS5 listener, once started. // of the node's SOCKS5 listener, once started.
func (n *testNode) socks5AddrChan() <-chan string { func (n *TestNode) socks5AddrChan() <-chan string {
ch := make(chan string, 1) ch := make(chan string, 1)
n.addLogLineHook(func(line []byte) { n.addLogLineHook(func(line []byte) {
const sub = "SOCKS5 listening on " const sub = "SOCKS5 listening on "
@ -585,7 +587,7 @@ func (n *testNode) socks5AddrChan() <-chan string {
return ch return ch
} }
func (n *testNode) AwaitSocksAddr(ch <-chan string) string { func (n *TestNode) AwaitSocksAddr(ch <-chan string) string {
t := n.env.t t := n.env.t
t.Helper() t.Helper()
timer := time.NewTimer(10 * time.Second) timer := time.NewTimer(10 * time.Second)
@ -605,7 +607,7 @@ func (n *testNode) AwaitSocksAddr(ch <-chan string) string {
type nodeOutputParser struct { type nodeOutputParser struct {
allBuf bytes.Buffer allBuf bytes.Buffer
pendLineBuf bytes.Buffer pendLineBuf bytes.Buffer
n *testNode n *TestNode
} }
func (op *nodeOutputParser) Write(p []byte) (n int, err error) { func (op *nodeOutputParser) Write(p []byte) (n int, err error) {
@ -658,11 +660,11 @@ func (d *Daemon) MustCleanShutdown(t testing.TB) {
// StartDaemon starts the node's tailscaled, failing if it fails to start. // StartDaemon starts the node's tailscaled, failing if it fails to start.
// StartDaemon ensures that the process will exit when the test completes. // StartDaemon ensures that the process will exit when the test completes.
func (n *testNode) StartDaemon() *Daemon { func (n *TestNode) StartDaemon() *Daemon {
return n.StartDaemonAsIPNGOOS(runtime.GOOS) return n.StartDaemonAsIPNGOOS(runtime.GOOS)
} }
func (n *testNode) StartDaemonAsIPNGOOS(ipnGOOS string) *Daemon { func (n *TestNode) StartDaemonAsIPNGOOS(ipnGOOS string) *Daemon {
t := n.env.t t := n.env.t
cmd := exec.Command(n.env.daemon) cmd := exec.Command(n.env.daemon)
cmd.Args = append(cmd.Args, cmd.Args = append(cmd.Args,
@ -725,12 +727,12 @@ func (n *testNode) StartDaemonAsIPNGOOS(ipnGOOS string) *Daemon {
} }
} }
func (n *testNode) MustUp(extraArgs ...string) { func (n *TestNode) MustUp(extraArgs ...string) {
t := n.env.t t := n.env.t
t.Helper() t.Helper()
args := []string{ args := []string{
"up", "up",
"--login-server=" + n.env.controlURL(), "--login-server=" + n.env.ControlURL(),
"--reset", "--reset",
} }
args = append(args, extraArgs...) args = append(args, extraArgs...)
@ -743,7 +745,7 @@ func (n *testNode) MustUp(extraArgs ...string) {
} }
} }
func (n *testNode) MustDown() { func (n *TestNode) MustDown() {
t := n.env.t t := n.env.t
t.Logf("Running down ...") t.Logf("Running down ...")
if err := n.Tailscale("down", "--accept-risk=all").Run(); err != nil { if err := n.Tailscale("down", "--accept-risk=all").Run(); err != nil {
@ -751,7 +753,7 @@ func (n *testNode) MustDown() {
} }
} }
func (n *testNode) MustLogOut() { func (n *TestNode) MustLogOut() {
t := n.env.t t := n.env.t
t.Logf("Running logout ...") t.Logf("Running logout ...")
if err := n.Tailscale("logout").Run(); err != nil { if err := n.Tailscale("logout").Run(); err != nil {
@ -759,7 +761,7 @@ func (n *testNode) MustLogOut() {
} }
} }
func (n *testNode) Ping(otherNode *testNode) error { func (n *TestNode) Ping(otherNode *TestNode) error {
t := n.env.t t := n.env.t
ip := otherNode.AwaitIP4().String() ip := otherNode.AwaitIP4().String()
t.Logf("Running ping %v (from %v)...", ip, n.AwaitIP4()) t.Logf("Running ping %v (from %v)...", ip, n.AwaitIP4())
@ -768,7 +770,7 @@ func (n *testNode) Ping(otherNode *testNode) error {
// AwaitListening waits for the tailscaled to be serving local clients // AwaitListening waits for the tailscaled to be serving local clients
// over its localhost IPC mechanism. (Unix socket, etc) // over its localhost IPC mechanism. (Unix socket, etc)
func (n *testNode) AwaitListening() { func (n *TestNode) AwaitListening() {
t := n.env.t t := n.env.t
if err := tstest.WaitFor(20*time.Second, func() (err error) { if err := tstest.WaitFor(20*time.Second, func() (err error) {
c, err := safesocket.ConnectContext(context.Background(), n.sockFile) c, err := safesocket.ConnectContext(context.Background(), n.sockFile)
@ -781,7 +783,7 @@ func (n *testNode) AwaitListening() {
} }
} }
func (n *testNode) AwaitIPs() []netip.Addr { func (n *TestNode) AwaitIPs() []netip.Addr {
t := n.env.t t := n.env.t
t.Helper() t.Helper()
var addrs []netip.Addr var addrs []netip.Addr
@ -815,7 +817,7 @@ func (n *testNode) AwaitIPs() []netip.Addr {
} }
// AwaitIP4 returns the IPv4 address of n. // AwaitIP4 returns the IPv4 address of n.
func (n *testNode) AwaitIP4() netip.Addr { func (n *TestNode) AwaitIP4() netip.Addr {
t := n.env.t t := n.env.t
t.Helper() t.Helper()
ips := n.AwaitIPs() ips := n.AwaitIPs()
@ -823,7 +825,7 @@ func (n *testNode) AwaitIP4() netip.Addr {
} }
// AwaitIP6 returns the IPv6 address of n. // AwaitIP6 returns the IPv6 address of n.
func (n *testNode) AwaitIP6() netip.Addr { func (n *TestNode) AwaitIP6() netip.Addr {
t := n.env.t t := n.env.t
t.Helper() t.Helper()
ips := n.AwaitIPs() ips := n.AwaitIPs()
@ -831,13 +833,13 @@ func (n *testNode) AwaitIP6() netip.Addr {
} }
// AwaitRunning waits for n to reach the IPN state "Running". // AwaitRunning waits for n to reach the IPN state "Running".
func (n *testNode) AwaitRunning() { func (n *TestNode) AwaitRunning() {
t := n.env.t t := n.env.t
t.Helper() t.Helper()
n.AwaitBackendState("Running") n.AwaitBackendState("Running")
} }
func (n *testNode) AwaitBackendState(state string) { func (n *TestNode) AwaitBackendState(state string) {
t := n.env.t t := n.env.t
t.Helper() t.Helper()
if err := tstest.WaitFor(20*time.Second, func() error { if err := tstest.WaitFor(20*time.Second, func() error {
@ -855,7 +857,7 @@ func (n *testNode) AwaitBackendState(state string) {
} }
// AwaitNeedsLogin waits for n to reach the IPN state "NeedsLogin". // AwaitNeedsLogin waits for n to reach the IPN state "NeedsLogin".
func (n *testNode) AwaitNeedsLogin() { func (n *TestNode) AwaitNeedsLogin() {
t := n.env.t t := n.env.t
t.Helper() t.Helper()
if err := tstest.WaitFor(20*time.Second, func() error { if err := tstest.WaitFor(20*time.Second, func() error {
@ -872,7 +874,7 @@ func (n *testNode) AwaitNeedsLogin() {
} }
} }
func (n *testNode) TailscaleForOutput(arg ...string) *exec.Cmd { func (n *TestNode) TailscaleForOutput(arg ...string) *exec.Cmd {
cmd := n.Tailscale(arg...) cmd := n.Tailscale(arg...)
cmd.Stdout = nil cmd.Stdout = nil
cmd.Stderr = nil cmd.Stderr = nil
@ -881,7 +883,7 @@ func (n *testNode) TailscaleForOutput(arg ...string) *exec.Cmd {
// Tailscale returns a command that runs the tailscale CLI with the provided arguments. // Tailscale returns a command that runs the tailscale CLI with the provided arguments.
// It does not start the process. // It does not start the process.
func (n *testNode) Tailscale(arg ...string) *exec.Cmd { func (n *TestNode) Tailscale(arg ...string) *exec.Cmd {
cmd := exec.Command(n.env.cli) cmd := exec.Command(n.env.cli)
cmd.Args = append(cmd.Args, "--socket="+n.sockFile) cmd.Args = append(cmd.Args, "--socket="+n.sockFile)
cmd.Args = append(cmd.Args, arg...) cmd.Args = append(cmd.Args, arg...)
@ -897,7 +899,7 @@ func (n *testNode) Tailscale(arg ...string) *exec.Cmd {
return cmd return cmd
} }
func (n *testNode) Status() (*ipnstate.Status, error) { func (n *TestNode) Status() (*ipnstate.Status, error) {
cmd := n.Tailscale("status", "--json") cmd := n.Tailscale("status", "--json")
cmd.Stdout = nil // in case --verbose-tailscale was set cmd.Stdout = nil // in case --verbose-tailscale was set
cmd.Stderr = nil // in case --verbose-tailscale was set cmd.Stderr = nil // in case --verbose-tailscale was set
@ -912,7 +914,7 @@ func (n *testNode) Status() (*ipnstate.Status, error) {
return st, nil return st, nil
} }
func (n *testNode) MustStatus() *ipnstate.Status { func (n *TestNode) MustStatus() *ipnstate.Status {
tb := n.env.t tb := n.env.t
tb.Helper() tb.Helper()
st, err := n.Status() st, err := n.Status()

122
tstest/integration/integration_test.go
View File

@ -68,9 +68,9 @@ func TestTUNMode(t *testing.T) {
t.Skip("skipping when not root") t.Skip("skipping when not root")
} }
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
env.tunMode = true env.tunMode = true
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
d1 := n1.StartDaemon() d1 := n1.StartDaemon()
n1.AwaitResponding() n1.AwaitResponding()
@ -85,8 +85,8 @@ func TestTUNMode(t *testing.T) {
func TestOneNodeUpNoAuth(t *testing.T) { func TestOneNodeUpNoAuth(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
d1 := n1.StartDaemon() d1 := n1.StartDaemon()
n1.AwaitResponding() n1.AwaitResponding()
@ -103,8 +103,8 @@ func TestOneNodeUpNoAuth(t *testing.T) {
func TestOneNodeExpiredKey(t *testing.T) { func TestOneNodeExpiredKey(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
d1 := n1.StartDaemon() d1 := n1.StartDaemon()
n1.AwaitResponding() n1.AwaitResponding()
@ -140,8 +140,8 @@ func TestOneNodeExpiredKey(t *testing.T) {
func TestControlKnobs(t *testing.T) { func TestControlKnobs(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
d1 := n1.StartDaemon() d1 := n1.StartDaemon()
defer d1.MustCleanShutdown(t) defer d1.MustCleanShutdown(t)
@ -171,8 +171,8 @@ func TestControlKnobs(t *testing.T) {
func TestCollectPanic(t *testing.T) { func TestCollectPanic(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
n := newTestNode(t, env) n := NewTestNode(t, env)
cmd := exec.Command(env.daemon, "--cleanup") cmd := exec.Command(env.daemon, "--cleanup")
cmd.Env = append(os.Environ(), cmd.Env = append(os.Environ(),
@ -202,9 +202,9 @@ func TestCollectPanic(t *testing.T) {
func TestControlTimeLogLine(t *testing.T) { func TestControlTimeLogLine(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
env.LogCatcher.StoreRawJSON() env.LogCatcher.StoreRawJSON()
n := newTestNode(t, env) n := NewTestNode(t, env)
n.StartDaemon() n.StartDaemon()
n.AwaitResponding() n.AwaitResponding()
@ -226,8 +226,8 @@ func TestControlTimeLogLine(t *testing.T) {
func TestStateSavedOnStart(t *testing.T) { func TestStateSavedOnStart(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
d1 := n1.StartDaemon() d1 := n1.StartDaemon()
n1.AwaitResponding() n1.AwaitResponding()
@ -245,7 +245,7 @@ func TestStateSavedOnStart(t *testing.T) {
n1.MustDown() n1.MustDown()
// And change the hostname to something: // And change the hostname to something:
if err := n1.Tailscale("up", "--login-server="+n1.env.controlURL(), "--hostname=foo").Run(); err != nil { if err := n1.Tailscale("up", "--login-server="+n1.env.ControlURL(), "--hostname=foo").Run(); err != nil {
t.Fatalf("up: %v", err) t.Fatalf("up: %v", err)
} }
@ -263,11 +263,11 @@ func TestStateSavedOnStart(t *testing.T) {
func TestOneNodeUpAuth(t *testing.T) { func TestOneNodeUpAuth(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t, configureControl(func(control *testcontrol.Server) { env := NewTestEnv(t, ConfigureControl(func(control *testcontrol.Server) {
control.RequireAuth = true control.RequireAuth = true
})) }))
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
d1 := n1.StartDaemon() d1 := n1.StartDaemon()
n1.AwaitListening() n1.AwaitListening()
@ -275,9 +275,9 @@ func TestOneNodeUpAuth(t *testing.T) {
st := n1.MustStatus() st := n1.MustStatus()
t.Logf("Status: %s", st.BackendState) t.Logf("Status: %s", st.BackendState)
t.Logf("Running up --login-server=%s ...", env.controlURL()) t.Logf("Running up --login-server=%s ...", env.ControlURL())
cmd := n1.Tailscale("up", "--login-server="+env.controlURL()) cmd := n1.Tailscale("up", "--login-server="+env.ControlURL())
var authCountAtomic int32 var authCountAtomic int32
cmd.Stdout = &authURLParserWriter{fn: func(urlStr string) error { cmd.Stdout = &authURLParserWriter{fn: func(urlStr string) error {
if env.Control.CompleteAuth(urlStr) { if env.Control.CompleteAuth(urlStr) {
@ -309,11 +309,11 @@ func TestConfigFileAuthKey(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
t.Parallel() t.Parallel()
const authKey = "opensesame" const authKey = "opensesame"
env := newTestEnv(t, configureControl(func(control *testcontrol.Server) { env := NewTestEnv(t, ConfigureControl(func(control *testcontrol.Server) {
control.RequireAuthKey = authKey control.RequireAuthKey = authKey
})) }))
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
n1.configFile = filepath.Join(n1.dir, "config.json") n1.configFile = filepath.Join(n1.dir, "config.json")
authKeyFile := filepath.Join(n1.dir, "my-auth-key") authKeyFile := filepath.Join(n1.dir, "my-auth-key")
must.Do(os.WriteFile(authKeyFile, fmt.Appendf(nil, "%s\n", authKey), 0666)) must.Do(os.WriteFile(authKeyFile, fmt.Appendf(nil, "%s\n", authKey), 0666))
@ -334,14 +334,14 @@ func TestConfigFileAuthKey(t *testing.T) {
func TestTwoNodes(t *testing.T) { func TestTwoNodes(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
// Create two nodes: // Create two nodes:
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
n1SocksAddrCh := n1.socks5AddrChan() n1SocksAddrCh := n1.socks5AddrChan()
d1 := n1.StartDaemon() d1 := n1.StartDaemon()
n2 := newTestNode(t, env) n2 := NewTestNode(t, env)
n2SocksAddrCh := n2.socks5AddrChan() n2SocksAddrCh := n2.socks5AddrChan()
d2 := n2.StartDaemon() d2 := n2.StartDaemon()
@ -360,7 +360,7 @@ func TestTwoNodes(t *testing.T) {
defer n2.mu.Unlock() defer n2.mu.Unlock()
rxNoDates := regexp.MustCompile(`(?m)^\d{4}.\d{2}.\d{2}.\d{2}:\d{2}:\d{2}`) rxNoDates := regexp.MustCompile(`(?m)^\d{4}.\d{2}.\d{2}.\d{2}:\d{2}:\d{2}`)
cleanLog := func(n *testNode) []byte { cleanLog := func(n *TestNode) []byte {
b := n.tailscaledParser.allBuf.Bytes() b := n.tailscaledParser.allBuf.Bytes()
b = rxNoDates.ReplaceAll(b, nil) b = rxNoDates.ReplaceAll(b, nil)
return b return b
@ -420,10 +420,10 @@ func TestTwoNodes(t *testing.T) {
func TestIncrementalMapUpdatePeersRemoved(t *testing.T) { func TestIncrementalMapUpdatePeersRemoved(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
// Create one node: // Create one node:
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
d1 := n1.StartDaemon() d1 := n1.StartDaemon()
n1.AwaitListening() n1.AwaitListening()
n1.MustUp() n1.MustUp()
@ -435,7 +435,7 @@ func TestIncrementalMapUpdatePeersRemoved(t *testing.T) {
} }
tnode1 := all[0] tnode1 := all[0]
n2 := newTestNode(t, env) n2 := NewTestNode(t, env)
d2 := n2.StartDaemon() d2 := n2.StartDaemon()
n2.AwaitListening() n2.AwaitListening()
n2.MustUp() n2.MustUp()
@ -505,8 +505,8 @@ func TestNodeAddressIPFields(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/7008") flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/7008")
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
d1 := n1.StartDaemon() d1 := n1.StartDaemon()
n1.AwaitListening() n1.AwaitListening()
@ -532,8 +532,8 @@ func TestNodeAddressIPFields(t *testing.T) {
func TestAddPingRequest(t *testing.T) { func TestAddPingRequest(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
n1.StartDaemon() n1.StartDaemon()
n1.AwaitListening() n1.AwaitListening()
@ -586,7 +586,7 @@ func TestC2NPingRequest(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
gotPing := make(chan bool, 1) gotPing := make(chan bool, 1)
env.Control.HandleC2N = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { env.Control.HandleC2N = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@ -604,7 +604,7 @@ func TestC2NPingRequest(t *testing.T) {
gotPing <- true gotPing <- true
}) })
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
n1.StartDaemon() n1.StartDaemon()
n1.AwaitListening() n1.AwaitListening()
@ -657,8 +657,8 @@ func TestC2NPingRequest(t *testing.T) {
func TestNoControlConnWhenDown(t *testing.T) { func TestNoControlConnWhenDown(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
d1 := n1.StartDaemon() d1 := n1.StartDaemon()
n1.AwaitResponding() n1.AwaitResponding()
@ -696,8 +696,8 @@ func TestNoControlConnWhenDown(t *testing.T) {
func TestOneNodeUpWindowsStyle(t *testing.T) { func TestOneNodeUpWindowsStyle(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
n1.upFlagGOOS = "windows" n1.upFlagGOOS = "windows"
d1 := n1.StartDaemonAsIPNGOOS("windows") d1 := n1.StartDaemonAsIPNGOOS("windows")
@ -716,9 +716,9 @@ func TestOneNodeUpWindowsStyle(t *testing.T) {
func TestClientSideJailing(t *testing.T) { func TestClientSideJailing(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
registerNode := func() (*testNode, key.NodePublic) { registerNode := func() (*TestNode, key.NodePublic) {
n := newTestNode(t, env) n := NewTestNode(t, env)
n.StartDaemon() n.StartDaemon()
n.AwaitListening() n.AwaitListening()
n.MustUp() n.MustUp()
@ -832,9 +832,9 @@ func TestNATPing(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
for _, v6 := range []bool{false, true} { for _, v6 := range []bool{false, true} {
env := newTestEnv(t) env := NewTestEnv(t)
registerNode := func() (*testNode, key.NodePublic) { registerNode := func() (*TestNode, key.NodePublic) {
n := newTestNode(t, env) n := NewTestNode(t, env)
n.StartDaemon() n.StartDaemon()
n.AwaitListening() n.AwaitListening()
n.MustUp() n.MustUp()
@ -959,11 +959,11 @@ func TestNATPing(t *testing.T) {
func TestLogoutRemovesAllPeers(t *testing.T) { func TestLogoutRemovesAllPeers(t *testing.T) {
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
// Spin up some nodes. // Spin up some nodes.
nodes := make([]*testNode, 2) nodes := make([]*TestNode, 2)
for i := range nodes { for i := range nodes {
nodes[i] = newTestNode(t, env) nodes[i] = NewTestNode(t, env)
nodes[i].StartDaemon() nodes[i].StartDaemon()
nodes[i].AwaitResponding() nodes[i].AwaitResponding()
nodes[i].MustUp() nodes[i].MustUp()
@ -1017,9 +1017,9 @@ func TestAutoUpdateDefaults(t *testing.T) {
} }
tstest.Shard(t) tstest.Shard(t)
tstest.Parallel(t) tstest.Parallel(t)
env := newTestEnv(t) env := NewTestEnv(t)
checkDefault := func(n *testNode, want bool) error { checkDefault := func(n *TestNode, want bool) error {
enabled, ok := n.diskPrefs().AutoUpdate.Apply.Get() enabled, ok := n.diskPrefs().AutoUpdate.Apply.Get()
if !ok { if !ok {
return fmt.Errorf("auto-update for node is unset, should be set as %v", want) return fmt.Errorf("auto-update for node is unset, should be set as %v", want)
@ -1030,7 +1030,7 @@ func TestAutoUpdateDefaults(t *testing.T) {
return nil return nil
} }
sendAndCheckDefault := func(t *testing.T, n *testNode, send, want bool) { sendAndCheckDefault := func(t *testing.T, n *TestNode, send, want bool) {
t.Helper() t.Helper()
if !env.Control.AddRawMapResponse(n.MustStatus().Self.PublicKey, &tailcfg.MapResponse{ if !env.Control.AddRawMapResponse(n.MustStatus().Self.PublicKey, &tailcfg.MapResponse{
DefaultAutoUpdate: opt.NewBool(send), DefaultAutoUpdate: opt.NewBool(send),
@ -1046,11 +1046,11 @@ func TestAutoUpdateDefaults(t *testing.T) {
tests := []struct { tests := []struct {
desc string desc string
run func(t *testing.T, n *testNode) run func(t *testing.T, n *TestNode)
}{ }{
{ {
desc: "tailnet-default-false", desc: "tailnet-default-false",
run: func(t *testing.T, n *testNode) { run: func(t *testing.T, n *TestNode) {
// First received default "false". // First received default "false".
sendAndCheckDefault(t, n, false, false) sendAndCheckDefault(t, n, false, false)
// Should not be changed even if sent "true" later. // Should not be changed even if sent "true" later.
@ -1064,7 +1064,7 @@ func TestAutoUpdateDefaults(t *testing.T) {
}, },
{ {
desc: "tailnet-default-true", desc: "tailnet-default-true",
run: func(t *testing.T, n *testNode) { run: func(t *testing.T, n *TestNode) {
// First received default "true". // First received default "true".
sendAndCheckDefault(t, n, true, true) sendAndCheckDefault(t, n, true, true)
// Should not be changed even if sent "false" later. // Should not be changed even if sent "false" later.
@ -1078,7 +1078,7 @@ func TestAutoUpdateDefaults(t *testing.T) {
}, },
{ {
desc: "user-sets-first", desc: "user-sets-first",
run: func(t *testing.T, n *testNode) { run: func(t *testing.T, n *TestNode) {
// User sets auto-update first, before receiving defaults. // User sets auto-update first, before receiving defaults.
if out, err := n.TailscaleForOutput("set", "--auto-update=false").CombinedOutput(); err != nil { if out, err := n.TailscaleForOutput("set", "--auto-update=false").CombinedOutput(); err != nil {
t.Fatalf("failed to disable auto-update on node: %v\noutput: %s", err, out) t.Fatalf("failed to disable auto-update on node: %v\noutput: %s", err, out)
@ -1091,7 +1091,7 @@ func TestAutoUpdateDefaults(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.desc, func(t *testing.T) { t.Run(tt.desc, func(t *testing.T) {
n := newTestNode(t, env) n := NewTestNode(t, env)
d := n.StartDaemon() d := n.StartDaemon()
defer d.MustCleanShutdown(t) defer d.MustCleanShutdown(t)
@ -1113,9 +1113,9 @@ func TestDNSOverTCPIntervalResolver(t *testing.T) {
if os.Getuid() != 0 { if os.Getuid() != 0 {
t.Skip("skipping when not root") t.Skip("skipping when not root")
} }
env := newTestEnv(t) env := NewTestEnv(t)
env.tunMode = true env.tunMode = true
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
d1 := n1.StartDaemon() d1 := n1.StartDaemon()
n1.AwaitResponding() n1.AwaitResponding()
@ -1186,12 +1186,12 @@ func TestNetstackTCPLoopback(t *testing.T) {
t.Skip("skipping when not root") t.Skip("skipping when not root")
} }
env := newTestEnv(t) env := NewTestEnv(t)
env.tunMode = true env.tunMode = true
loopbackPort := 5201 loopbackPort := 5201
env.loopbackPort = &loopbackPort env.loopbackPort = &loopbackPort
loopbackPortStr := strconv.Itoa(loopbackPort) loopbackPortStr := strconv.Itoa(loopbackPort)
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
d1 := n1.StartDaemon() d1 := n1.StartDaemon()
n1.AwaitResponding() n1.AwaitResponding()
@ -1328,11 +1328,11 @@ func TestNetstackUDPLoopback(t *testing.T) {
t.Skip("skipping when not root") t.Skip("skipping when not root")
} }
env := newTestEnv(t) env := NewTestEnv(t)
env.tunMode = true env.tunMode = true
loopbackPort := 5201 loopbackPort := 5201
env.loopbackPort = &loopbackPort env.loopbackPort = &loopbackPort
n1 := newTestNode(t, env) n1 := NewTestNode(t, env)
d1 := n1.StartDaemon() d1 := n1.StartDaemon()
n1.AwaitResponding() n1.AwaitResponding()