TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-20 05:31:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: don't call t.Fatal in magicStack.IP

Browse Source 
It can end up executing an a new goroutine,
at which point instead of immediately stopping test execution, it hangs.
Since this is unexpected anyway, panic instead.
As a bonus, it makes call sites nicer and removes a kludge comment.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2021-03-29 13:50:44 -07:00 committed by Josh Bleecher Snyder
parent 672b9fd4bd
commit 36a85e1760
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wgengine/magicsock/magicsock_test.go
View File

@ -228,15 +228,14 @@ func (s *magicStack) Status() *ipnstate.Status {
// Something external needs to provide a NetworkMap and WireGuard // Something external needs to provide a NetworkMap and WireGuard
// configs to the magicStack in order for it to acquire an IP // configs to the magicStack in order for it to acquire an IP
// address. See meshStacks for one possible source of netmaps and IPs. // address. See meshStacks for one possible source of netmaps and IPs.
func (s *magicStack) IP(t *testing.T) netaddr.IP { func (s *magicStack) IP() netaddr.IP {
for deadline := time.Now().Add(5 * time.Second); time.Now().Before(deadline); time.Sleep(10 * time.Millisecond) { for deadline := time.Now().Add(5 * time.Second); time.Now().Before(deadline); time.Sleep(10 * time.Millisecond) {
st := s.Status() st := s.Status()
if len(st.TailscaleIPs) > 0 { if len(st.TailscaleIPs) > 0 {
return st.TailscaleIPs[0] return st.TailscaleIPs[0]
} }
} }
t.Fatal("timed out waiting for magicstack to get an IP assigned") panic("timed out waiting for magicstack to get an IP assigned")
panic("unreachable") // compiler doesn't know t.Fatal panics
} }
// meshStacks monitors epCh on all given ms, and plumbs network maps // meshStacks monitors epCh on all given ms, and plumbs network maps
@ -566,7 +565,7 @@ func TestConnClosed(t *testing.T) {
cleanup = meshStacks(t.Logf, []*magicStack{ms1, ms2}) cleanup = meshStacks(t.Logf, []*magicStack{ms1, ms2})
defer cleanup() defer cleanup()
pkt := tuntest.Ping(ms2.IP(t).IPAddr().IP, ms1.IP(t).IPAddr().IP) pkt := tuntest.Ping(ms2.IP().IPAddr().IP, ms1.IP().IPAddr().IP)
if len(ms1.conn.activeDerp) == 0 { if len(ms1.conn.activeDerp) == 0 {
t.Errorf("unexpected DERP empty got: %v want: >0", len(ms1.conn.activeDerp)) t.Errorf("unexpected DERP empty got: %v want: >0", len(ms1.conn.activeDerp))
@ -767,7 +766,7 @@ func newPinger(t *testing.T, logf logger.Logf, src, dst *magicStack) (cleanup fu
// failure). Figure out what kind of thing would be // failure). Figure out what kind of thing would be
// acceptable to test instead of "every ping must // acceptable to test instead of "every ping must
// transit". // transit".
pkt := tuntest.Ping(dst.IP(t).IPAddr().IP, src.IP(t).IPAddr().IP) pkt := tuntest.Ping(dst.IP().IPAddr().IP, src.IP().IPAddr().IP)
select { select {
case src.tun.Outbound <- pkt: case src.tun.Outbound <- pkt:
case <-ctx.Done(): case <-ctx.Done():
@ -812,7 +811,7 @@ func newPinger(t *testing.T, logf logger.Logf, src, dst *magicStack) (cleanup fu
} }
go func() { go func() {
logf("sending ping stream from %s (%s) to %s (%s)", src, src.IP(t), dst, dst.IP(t)) logf("sending ping stream from %s (%s) to %s (%s)", src, src.IP(), dst, dst.IP())
defer close(done) defer close(done)
for one() { for one() {
} }
@ -852,8 +851,8 @@ func testActiveDiscovery(t *testing.T, d *devices) {
cleanup = meshStacks(logf, []*magicStack{m1, m2}) cleanup = meshStacks(logf, []*magicStack{m1, m2})
defer cleanup() defer cleanup()
m1IP := m1.IP(t) m1IP := m1.IP()
m2IP := m2.IP(t) m2IP := m2.IP()
logf("IPs: %s %s", m1IP, m2IP) logf("IPs: %s %s", m1IP, m2IP)
cleanup = newPinger(t, logf, m1, m2) cleanup = newPinger(t, logf, m1, m2)