snow/wireguard-go
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

device: make test infrastructure usable with benchmarks

Browse source 
Switch from *testing.T to testing.TB.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2021-01-05 15:03:24 -08:00 committed by Jason A. Donenfeld
parent 3d83df9bf3
commit cdaf4e9a76
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
device/device_test.go
View file

@ -18,10 +18,10 @@ import (
"golang.zx2c4.com/wireguard/tun/tuntest" "golang.zx2c4.com/wireguard/tun/tuntest"
) )
func getFreePort(t *testing.T) string { func getFreePort(tb testing.TB) string {
l, err := net.ListenPacket("udp", "localhost:0") l, err := net.ListenPacket("udp", "localhost:0")
if err != nil { if err != nil {
t.Fatal(err) tb.Fatal(err)
} }
defer l.Close() defer l.Close()
return fmt.Sprintf("%d", l.LocalAddr().(*net.UDPAddr).Port) return fmt.Sprintf("%d", l.LocalAddr().(*net.UDPAddr).Port)
@ -51,11 +51,11 @@ func uapiCfg(cfg ...string) io.ReadSeeker {
// genConfigs generates a pair of configs that connect to each other. // genConfigs generates a pair of configs that connect to each other.
// The configs use distinct, probably-usable ports. // The configs use distinct, probably-usable ports.
func genConfigs(t *testing.T) (cfgs [2]io.Reader) { func genConfigs(tb testing.TB) (cfgs [2]io.Reader) {
var port1, port2 string var port1, port2 string
for port1 == port2 { for port1 == port2 {
port1 = getFreePort(t) port1 = getFreePort(tb)
port2 = getFreePort(t) port2 = getFreePort(tb)
} }
cfgs[0] = uapiCfg( cfgs[0] = uapiCfg(
@ -98,8 +98,8 @@ const (
Pong SendDirection = false Pong SendDirection = false
) )
func (pair *testPair) Send(t *testing.T, ping SendDirection, done chan struct{}) { func (pair *testPair) Send(tb testing.TB, ping SendDirection, done chan struct{}) {
t.Helper() tb.Helper()
p0, p1 := pair[0], pair[1] p0, p1 := pair[0], pair[1]
if !ping { if !ping {
// pong is the new ping // pong is the new ping
@ -127,16 +127,16 @@ func (pair *testPair) Send(t *testing.T, ping SendDirection, done chan struct{})
default: default:
} }
// Real error. // Real error.
t.Error(err) tb.Error(err)
} }
} }
// genTestPair creates a testPair. // genTestPair creates a testPair.
func genTestPair(t *testing.T) (pair testPair) { func genTestPair(tb testing.TB) (pair testPair) {
const maxAttempts = 10 const maxAttempts = 10
NextAttempt: NextAttempt:
for i := 0; i < maxAttempts; i++ { for i := 0; i < maxAttempts; i++ {
cfg := genConfigs(t) cfg := genConfigs(tb)
// Bring up a ChannelTun for each config. // Bring up a ChannelTun for each config.
for i := range pair { for i := range pair {
p := &pair[i] p := &pair[i]
@ -156,23 +156,23 @@ NextAttempt:
// Try again from the beginning. // Try again from the beginning.
// If there's something permanent wrong, // If there's something permanent wrong,
// we'll see that when we run out of attempts. // we'll see that when we run out of attempts.
t.Logf("failed to configure device %d: %v", i, err) tb.Logf("failed to configure device %d: %v", i, err)
continue NextAttempt continue NextAttempt
} }
// The device might still not be up, e.g. due to an error // The device might still not be up, e.g. due to an error
// in RoutineTUNEventReader's call to dev.Up that got swallowed. // in RoutineTUNEventReader's call to dev.Up that got swallowed.
// Assume it's due to a transient error (port in use), and retry. // Assume it's due to a transient error (port in use), and retry.
if !p.dev.isUp.Get() { if !p.dev.isUp.Get() {
t.Logf("device %d did not come up, trying again", i) tb.Logf("device %d did not come up, trying again", i)
continue NextAttempt continue NextAttempt
} }
// The device is up. Close it when the test completes. // The device is up. Close it when the test completes.
t.Cleanup(p.dev.Close) tb.Cleanup(p.dev.Close)
} }
return // success return // success
} }
t.Fatalf("genChannelTUNs: failed %d times", maxAttempts) tb.Fatalf("genChannelTUNs: failed %d times", maxAttempts)
return return
} }