Skip to content

Commit 6f1e071

Browse files
europauleriknordmark
authored andcommitted
fix: create errors from non-constant strings
Since go 1.24 vet reports the usage of non-constant strings in Printf as errors (see https://tip.golang.org/doc/go1.24#vet). This change fixes the found occurrences in our tests. Signed-off-by: Paul Gaiduk <paulg@zededa.com>
1 parent 510f7b1 commit 6f1e071

File tree

6 files changed

+19
-14
lines changed

6 files changed

+19
-14
lines changed

tests/app/app_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package lim
22

33
import (
4+
"errors"
45
"flag"
56
"fmt"
67
"os"
@@ -108,7 +109,7 @@ func checkState(eveState *eve.State, state string, appNames []string) error {
108109
"no app with %s found\n",
109110
appName))
110111
}
111-
return fmt.Errorf(out)
112+
return errors.New(out)
112113
}
113114
for _, app := range eveState.Applications() {
114115
if _, inSlice := utils.FindEleInSlice(appNames, app.Name); inSlice {
@@ -125,7 +126,7 @@ func checkState(eveState *eve.State, state string, appNames []string) error {
125126
return nil
126127
}
127128
}
128-
return fmt.Errorf(out)
129+
return errors.New(out)
129130
}
130131
return nil
131132
}

tests/docker/docker_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package lim
22

33
import (
4+
"errors"
45
"flag"
56
"fmt"
67
"math/rand"
@@ -118,15 +119,15 @@ func checkAppAccess(edgeNode *device.Ctx) testcontext.ProcTimerFunc {
118119
if err != nil {
119120
return nil
120121
}
121-
return fmt.Errorf(res)
122+
return errors.New(res)
122123
}
123124
return tc.PortForwardCommand(func(fwdPort uint16) error {
124125
res, err := utils.RequestHTTPWithTimeout(
125126
fmt.Sprintf("http://127.0.0.1:%d", fwdPort), time.Second)
126127
if err != nil {
127128
return nil
128129
}
129-
return fmt.Errorf(res)
130+
return errors.New(res)
130131
}, "eth0", uint16(*externalPort))
131132
}
132133
}

tests/lim/lim_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package lim
22

33
import (
4+
"errors"
45
"flag"
56
"fmt"
67
"os"
@@ -183,7 +184,7 @@ func TestLog(t *testing.T) {
183184

184185
cnt := count("Received %d logs from %s", name.String())
185186
if cnt != "" {
186-
return fmt.Errorf(cnt)
187+
return errors.New(cnt)
187188
}
188189
return nil
189190
}(t, edgeNode, log)
@@ -253,7 +254,7 @@ func TestAppLog(t *testing.T) {
253254

254255
cnt := count("Received %d app logs from %s", name.String())
255256
if cnt != "" {
256-
return fmt.Errorf(cnt)
257+
return errors.New(cnt)
257258
}
258259
return nil
259260
}(t, edgeNode, log)
@@ -294,7 +295,7 @@ func TestInfo(t *testing.T) {
294295
}
295296
cnt := count("Received %d infos from %s", name.String())
296297
if cnt != "" {
297-
return fmt.Errorf(cnt)
298+
return errors.New(cnt)
298299
}
299300
return nil
300301
}(t, edgeNode, ei)
@@ -337,7 +338,7 @@ func TestMetrics(t *testing.T) {
337338

338339
cnt := count("Received %d metrics from %s", name.String())
339340
if cnt != "" {
340-
return fmt.Errorf(cnt)
341+
return errors.New(cnt)
341342
}
342343
return nil
343344
}(t, edgeNode, metric)
@@ -377,7 +378,7 @@ func TestFlowLog(t *testing.T) {
377378

378379
cnt := count("Received %d FlowLog from %s", name.String())
379380
if cnt != "" {
380-
return fmt.Errorf(cnt)
381+
return errors.New(cnt)
381382
}
382383
return nil
383384
}(t, edgeNode, log)

tests/network/nw_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package network
22

33
import (
4+
"errors"
45
"flag"
56
"fmt"
67
"os"
@@ -88,7 +89,7 @@ func checkState(eveState *eve.State, state string, netNames []string) error {
8889
"no network with %s found\n",
8990
netName)
9091
}
91-
return fmt.Errorf(out)
92+
return errors.New(out)
9293
}
9394
for _, net := range eveState.Networks() {
9495
if _, inSlice := utils.FindEleInSlice(netNames, net.Name); inSlice {
@@ -105,7 +106,7 @@ func checkState(eveState *eve.State, state string, netNames []string) error {
105106
return nil
106107
}
107108
}
108-
return fmt.Errorf(out)
109+
return errors.New(out)
109110
}
110111
return nil
111112
}

tests/vcom/vcom_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func logFatalf(format string, args ...interface{}) {
3838
func logInfof(format string, args ...interface{}) {
3939
out := utils.AddTimestampf(format+"\n", args...)
4040
if logT != nil {
41-
logT.Logf(out)
41+
logT.Log(out)
4242
} else {
4343
fmt.Print(out)
4444
}

tests/volume/vol_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package lim
22

33
import (
4+
"errors"
45
"flag"
56
"fmt"
67
"os"
@@ -92,7 +93,7 @@ func checkState(eveState *eve.State, state string, volNames []string) error {
9293
"no volume with %s found\n",
9394
volName)
9495
}
95-
return fmt.Errorf(out)
96+
return errors.New(out)
9697
}
9798
for _, vol := range eveState.Volumes() {
9899
if _, inSlice := utils.FindEleInSlice(volNames, vol.Name); inSlice {
@@ -109,7 +110,7 @@ func checkState(eveState *eve.State, state string, volNames []string) error {
109110
return nil
110111
}
111112
}
112-
return fmt.Errorf(out)
113+
return errors.New(out)
113114
}
114115
return nil
115116
}

0 commit comments

Comments
 (0)