mirror of
https://github.com/tailscale/tailscale.git
synced 2026-04-03 14:13:12 -04:00
wgengine/magicsock: assume network up for tests
Without this, any test relying on underlying use of magicsock will fail without network connectivity, even when the test logic has no need for a network connection. Tests currently in this bucket include many in tstest/integration and in tsnet. Further explanation: ipn only becomes Running when it sees at least one live peer or DERP connection:0cc1b2ff76/ipn/ipnlocal/local.go (L5861-L5866)When tests only use a single node, they will never see a peer, so the node has to wait to see a DERP server. magicsock sets the preferred DERP server in updateNetInfo(), but this function returns early if the network is down.0cc1b2ff76/wgengine/magicsock/magicsock.go (L1053-L1106)Because we're checking the real network, this prevents ipn from entering "Running" and causes the test to fail or hang. In tests, we can assume the network is up unless we're explicitly testing the behaviour of tailscaled when the network is down. We do something similar in magicsock/derp.go, where we assume we're connected to control unless explicitly testing otherwise:7d2101f352/wgengine/magicsock/derp.go (L166-L177)This is the template for the changes to `networkDown()`. Fixes #17122 Co-authored-by: Alex Chan <alexc@tailscale.com> Signed-off-by: Harry Harpham <harry@tailscale.com>
This commit is contained in:
@@ -405,6 +405,9 @@ func SSHIgnoreTailnetPolicy() bool { return Bool("TS_DEBUG_SSH_IGNORE_TAILNET_PO
|
||||
// TKASkipSignatureCheck reports whether to skip node-key signature checking for development.
|
||||
func TKASkipSignatureCheck() bool { return Bool("TS_UNSAFE_SKIP_NKS_VERIFICATION") }
|
||||
|
||||
// AssumeNetworkUp reports whether to assume network connectivity for development.
|
||||
func AssumeNetworkUp() bool { return Bool("TS_ASSUME_NETWORK_UP_FOR_TEST") }
|
||||
|
||||
// App returns the tailscale app type of this instance, if set via
|
||||
// TS_INTERNAL_APP env var. TS_INTERNAL_APP can be used to set app type for
|
||||
// components that wrap tailscaled, such as containerboot. App type is intended
|
||||
|
||||
@@ -963,8 +963,6 @@ func (b *LocalBackend) setConfigLocked(conf *conffile.Config) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
var assumeNetworkUpdateForTest = envknob.RegisterBool("TS_ASSUME_NETWORK_UP_FOR_TEST")
|
||||
|
||||
// pauseOrResumeControlClientLocked pauses b.cc if there is no network available
|
||||
// or if the LocalBackend is in Stopped state with a valid NetMap. In all other
|
||||
// cases, it unpauses it. It is a no-op if b.cc is nil.
|
||||
@@ -976,7 +974,7 @@ func (b *LocalBackend) pauseOrResumeControlClientLocked() {
|
||||
return
|
||||
}
|
||||
networkUp := b.interfaceState.AnyInterfaceUp()
|
||||
pauseForNetwork := (b.state == ipn.Stopped && b.NetMap() != nil) || (!networkUp && !testenv.InTest() && !assumeNetworkUpdateForTest())
|
||||
pauseForNetwork := (b.state == ipn.Stopped && b.NetMap() != nil) || (!networkUp && !testenv.InTest() && !envknob.AssumeNetworkUp())
|
||||
|
||||
prefs := b.pm.CurrentPrefs()
|
||||
pauseForSyncPref := prefs.Valid() && prefs.Sync().EqualBool(false)
|
||||
|
||||
@@ -1438,7 +1438,18 @@ func (c *Conn) LocalPort() uint16 {
|
||||
|
||||
var errNetworkDown = errors.New("magicsock: network down")
|
||||
|
||||
func (c *Conn) networkDown() bool { return !c.networkUp.Load() }
|
||||
// This allows tests to pass when the user's machine is offline, but allows us
|
||||
// to still test network-down behaviour when desired.
|
||||
var checkNetworkDownDuringTests = false
|
||||
|
||||
func (c *Conn) networkDown() bool {
|
||||
// For tests, always assume the network is up unless we're explicitly
|
||||
// testing this behaviour.
|
||||
if envknob.AssumeNetworkUp() || (testenv.InTest() && !checkNetworkDownDuringTests) {
|
||||
return false
|
||||
}
|
||||
return !c.networkUp.Load()
|
||||
}
|
||||
|
||||
// Send implements conn.Bind.
|
||||
//
|
||||
|
||||
@@ -3241,6 +3241,8 @@ func TestNetworkSendErrors(t *testing.T) {
|
||||
t.Skipf("skipping on %s", runtime.GOOS)
|
||||
}
|
||||
|
||||
tstest.Replace(t, &checkNetworkDownDuringTests, true)
|
||||
|
||||
conn, reg, close := newTestConnAndRegistry(t)
|
||||
defer close()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user