aboutsummaryrefslogtreecommitdiffstats
path: root/device/device_test.go
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2021-02-03 17:29:01 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2021-02-03 17:29:01 +0100
commitd9d547a3f3f83f6ea23e140e3665ac41b6aca10a (patch)
treec8203566d12122a07e0e5290c42bfd827c97d368 /device/device_test.go
parentdevice: benchmark the waitpool to compare it to the prior channels (diff)
downloadwireguard-go-d9d547a3f3f83f6ea23e140e3665ac41b6aca10a.tar.xz
wireguard-go-d9d547a3f3f83f6ea23e140e3665ac41b6aca10a.zip
device: pass cfg strings around in tests instead of reader
This makes it easier to tag things onto the end manually for quick hacks. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'device/device_test.go')
-rw-r--r--device/device_test.go16
1 files changed, 7 insertions, 9 deletions
diff --git a/device/device_test.go b/device/device_test.go
index 9290ff0..6b443ce 100644
--- a/device/device_test.go
+++ b/device/device_test.go
@@ -9,7 +9,6 @@ import (
"bytes"
"errors"
"fmt"
- "io"
"io/ioutil"
"net"
"runtime"
@@ -31,13 +30,13 @@ func getFreePort(tb testing.TB) string {
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.
// uapiCfg exists because editors and humans like to insert
// whitespace into configs, which can cause failures, some of which are silent.
// For example, a leading blank newline causes the remainder
// of the config to be silently ignored.
-func uapiCfg(cfg ...string) io.ReadSeeker {
+func uapiCfg(cfg ...string) string {
if len(cfg)%2 != 0 {
panic("odd number of args to uapiReader")
}
@@ -50,12 +49,12 @@ func uapiCfg(cfg ...string) io.ReadSeeker {
}
buf.WriteByte(sep)
}
- return bytes.NewReader(buf.Bytes())
+ return buf.String()
}
// genConfigs generates a pair of configs that connect to each other.
// 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
for port1 == port2 {
port1 = getFreePort(tb)
@@ -156,7 +155,7 @@ NextAttempt:
}
p.dev = NewDevice(p.tun.TUN(), NewLogger(level, fmt.Sprintf("dev%d: ", i)))
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.
// There's a tiny window between genConfigs closing the port
// and us opening it, during which another process could
@@ -226,9 +225,8 @@ func TestConcurrencySafety(t *testing.T) {
}()
warmup.Wait()
- applyCfg := func(cfg io.ReadSeeker) {
- cfg.Seek(0, io.SeekStart)
- err := pair[0].dev.IpcSetOperation(cfg)
+ applyCfg := func(cfg string) {
+ err := pair[0].dev.IpcSet(cfg)
if err != nil {
t.Fatal(err)
}