diff options
Diffstat (limited to 'net/portmapper/igd_test.go')
| -rw-r--r-- | net/portmapper/igd_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/portmapper/igd_test.go b/net/portmapper/igd_test.go index 77015f5bf..33fc41efd 100644 --- a/net/portmapper/igd_test.go +++ b/net/portmapper/igd_test.go @@ -20,6 +20,7 @@ import ( "tailscale.com/tstest" "tailscale.com/types/logger" "tailscale.com/util/eventbus" + "tailscale.com/util/eventbus/eventbustest" "tailscale.com/util/testenv" ) @@ -213,7 +214,6 @@ func (d *TestIGD) handlePMPQuery(pkt []byte, src netip.AddrPort) { return } d.inc(&d.counters.numPMPPublicAddrRecv) - } // TODO } @@ -266,15 +266,15 @@ func (d *TestIGD) handlePCPQuery(pkt []byte, src netip.AddrPort) { // A cleanup for the resulting client is also added to t. func newTestClient(t *testing.T, igd *TestIGD, bus *eventbus.Bus) *Client { if bus == nil { - bus = eventbus.New() + bus = eventbustest.NewBus(t) t.Log("Created empty event bus for test client") - t.Cleanup(bus.Close) } var c *Client c = NewClient(Config{ - Logf: tstest.WhileTestRunningLogger(t), - NetMon: netmon.NewStatic(), - EventBus: bus, + ShutdownCtx: t.Context(), + Logf: tstest.WhileTestRunningLogger(t), + NetMon: netmon.NewStatic(), + EventBus: bus, OnChange: func() { // TODO(creachadair): Remove. t.Logf("port map changed") t.Logf("have mapping: %v", c.HaveMapping()) |