aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2019-12-30 19:06:32 +0100
committerMartin Polden <mpolden@mpolden.no>2019-12-30 19:52:40 +0100
commit794dc8cebec166cd35a9e2d51f8d423e66547939 (patch)
treec8985507888df687f45300f03ad1a5dbec65eb18
parent1e7f22f25dd238db5e54919cc44fc12078169e10 (diff)
Simplify
-rw-r--r--cmd/zdns/main_test.go10
1 files changed, 2 insertions, 8 deletions
diff --git a/cmd/zdns/main_test.go b/cmd/zdns/main_test.go
index 46ef643..ee24b5d 100644
--- a/cmd/zdns/main_test.go
+++ b/cmd/zdns/main_test.go
@@ -8,18 +8,12 @@ import (
"testing"
)
-func handleErr(t *testing.T, fn func() error) {
- if err := fn(); err != nil {
- t.Fatal(err)
- }
-}
-
func tempFile(t *testing.T, s string) (string, error) {
f, err := ioutil.TempFile("", "zdns")
if err != nil {
return "", err
}
- defer handleErr(t, f.Close)
+ defer f.Close()
if err := ioutil.WriteFile(f.Name(), []byte(s), 0644); err != nil {
return "", err
}
@@ -51,7 +45,7 @@ hijack_mode = "zero"
args: []string{"-f", f},
signal: make(chan os.Signal, 1),
}
- wg := sync.WaitGroup{}
+ var wg sync.WaitGroup
wg.Add(1)
go func() {
defer wg.Done()