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

device: pass cfg strings around in tests instead of reader

Browse source 
This makes it easier to tag things onto the end manually for quick hacks.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2021-02-03 17:29:01 +01:00
parent c3bde5f590
commit d9d547a3f3
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
device/device_test.go
View file

@ -9,7 +9,6 @@ import (
"bytes" "bytes"
"errors" "errors"
"fmt" "fmt"
"io"
"io/ioutil" "io/ioutil"
"net" "net"
"runtime" "runtime"
@ -31,13 +30,13 @@ func getFreePort(tb testing.TB) string {
return fmt.Sprintf("%d", l.LocalAddr().(*net.UDPAddr).Port) return fmt.Sprintf("%d", l.LocalAddr().(*net.UDPAddr).Port)
} }
// uapiCfg returns a reader that contains cfg formatted use with IpcSetOperation. // uapiCfg returns a string that contains cfg formatted use with IpcSet.
// cfg is a series of alternating key/value strings. // cfg is a series of alternating key/value strings.
// uapiCfg exists because editors and humans like to insert // uapiCfg exists because editors and humans like to insert
// whitespace into configs, which can cause failures, some of which are silent. // whitespace into configs, which can cause failures, some of which are silent.
// For example, a leading blank newline causes the remainder // For example, a leading blank newline causes the remainder
// of the config to be silently ignored. // of the config to be silently ignored.
func uapiCfg(cfg ...string) io.ReadSeeker { func uapiCfg(cfg ...string) string {
if len(cfg)%2 != 0 { if len(cfg)%2 != 0 {
panic("odd number of args to uapiReader") panic("odd number of args to uapiReader")
} }
@ -50,12 +49,12 @@ func uapiCfg(cfg ...string) io.ReadSeeker {
} }
buf.WriteByte(sep) buf.WriteByte(sep)
} }
return bytes.NewReader(buf.Bytes()) return buf.String()
} }
// 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(tb testing.TB) (cfgs [2]io.Reader) { func genConfigs(tb testing.TB) (cfgs [2]string) {
var port1, port2 string var port1, port2 string
for port1 == port2 { for port1 == port2 {
port1 = getFreePort(tb) port1 = getFreePort(tb)
@ -156,7 +155,7 @@ NextAttempt:
} }
p.dev = NewDevice(p.tun.TUN(), NewLogger(level, fmt.Sprintf("dev%d: ", i))) p.dev = NewDevice(p.tun.TUN(), NewLogger(level, fmt.Sprintf("dev%d: ", i)))
p.dev.Up() p.dev.Up()
if err := p.dev.IpcSetOperation(cfg[i]); err != nil { if err := p.dev.IpcSet(cfg[i]); err != nil {
// genConfigs attempted to pick ports that were free. // genConfigs attempted to pick ports that were free.
// There's a tiny window between genConfigs closing the port // There's a tiny window between genConfigs closing the port
// and us opening it, during which another process could // and us opening it, during which another process could
@ -226,9 +225,8 @@ func TestConcurrencySafety(t *testing.T) {
}() }()
warmup.Wait() warmup.Wait()
applyCfg := func(cfg io.ReadSeeker) { applyCfg := func(cfg string) {
cfg.Seek(0, io.SeekStart) err := pair[0].dev.IpcSet(cfg)
err := pair[0].dev.IpcSetOperation(cfg)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }