Skip to content
This repository was archived by the owner on Jan 29, 2025. It is now read-only.

Commit ac2bb45

Browse files
killianmuldoonkillianmuldoon
killianmuldoon
authored andcommitted
Fix ineffassign lint errors
Fix "err" usage in unit tests and other code to check each error where it happens instead of combining errors for broader unit test failure checks.
1 parent 5c4ecdc commit ac2bb45

File tree

4 files changed

+26
-0
lines changed

4 files changed

+26
-0
lines changed

cmd/tas-policy-controller/main.go

+3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ func main() {
3737
panic(err)
3838
}
3939
syncDuration, err := time.ParseDuration(syncPeriod)
40+
if err != nil {
41+
panic(err)
42+
}
4043
metricsClient := metrics.NewClient(clientConfig)
4144
telpolicyClient, _, err := telemetrypolicyclient.NewRest(*clientConfig)
4245
if err != nil {

pkg/cache/autoupdating_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,9 @@ func TestNodeMetricsCache_WriteMetric(t *testing.T) {
177177
for _, tt := range tests {
178178
t.Run(tt.name, func(t *testing.T) {
179179
err := tt.n.WriteMetric(tt.args.metricName, nil)
180+
if err == nil && tt.errorExpected {
181+
t.Fail()
182+
}
180183
_, err = tt.n.ReadMetric(tt.queriedMetric)
181184
if err == nil && tt.errorExpected {
182185
t.Fail()

pkg/metrics/client_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"io/ioutil"
77
"k8s.io/client-go/tools/clientcmd"
8+
"log"
89
"reflect"
910
"testing"
1011
"time"
@@ -38,6 +39,9 @@ func dummyRestClientConfig() *restclient.Config {
3839
fallbackReader := bytes.NewBuffer([]byte{})
3940
clientConfig := clientcmd.NewInteractiveDeferredLoadingClientConfig(loadingRules, overrides, fallbackReader)
4041
restConfig, err := clientConfig.ClientConfig()
42+
if err == nil {
43+
log.Fatalf("Can't create dummy rest client config %v ", err)
44+
}
4145
return restConfig
4246
}
4347

pkg/scheduler/scheduler_test.go

+16
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ func TestMetricsExtender_prescheduleChecks(t *testing.T) {
111111
t.Run(tt.name, func(t *testing.T) {
112112
m := NewMetricsExtender(tt.fields.cache)
113113
err := tt.fields.cache.WritePolicy(tt.fields.policy.Namespace, tt.fields.policy.Name, tt.fields.policy)
114+
if err != nil && tt.wantErr {
115+
log.Print(err)
116+
return
117+
}
114118
argsAsJSON, err := json.Marshal(tt.prioritizeArgs)
115119
if err != nil && tt.wantErr {
116120
log.Print(err)
@@ -194,6 +198,10 @@ func TestMetricsExtender_Prioritize(t *testing.T) {
194198
t.Run(tt.name, func(t *testing.T) {
195199
m := NewMetricsExtender(tt.fields.cache)
196200
err := tt.fields.cache.WritePolicy(tt.fields.policy.Namespace, tt.fields.policy.Name, tt.fields.policy)
201+
if err != nil && tt.wantErr {
202+
log.Print(err)
203+
return
204+
}
197205
argsAsJSON, err := json.Marshal(tt.prioritizeArgs)
198206
if err != nil && tt.wantErr {
199207
log.Print(err)
@@ -283,7 +291,15 @@ func TestMetricsExtender_Filter(t *testing.T) {
283291
cache: tt.fields.cache,
284292
}
285293
err := tt.fields.cache.WritePolicy(tt.fields.policy.Namespace, tt.fields.policy.Name, tt.fields.policy)
294+
if err != nil && tt.wantErr {
295+
log.Print(err)
296+
return
297+
}
286298
err = tt.fields.cache.WriteMetric(tt.fields.policy.Spec.Strategies["dontschedule"].Rules[0].Metricname, tt.args.metric)
299+
if err != nil && tt.wantErr {
300+
log.Print(err)
301+
return
302+
}
287303
argsAsJSON, err := json.Marshal(twoNodeArgument)
288304
if err != nil {
289305
log.Print(err)

0 commit comments

Comments
 (0)