Skip to content

Commit 197d597

Browse files
twz123twz123
authored
Merge pull request #5548 from twz123/enable-usetesting
Enable usetesting linter
2 parents d719fb2 + 9133a46 commit 197d597

File tree

3 files changed

+41
-61
lines changed

3 files changed

+41
-61
lines changed

‎.golangci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ linters:
2727
- unconvert # Checks for unnecessary type conversions
2828
- unparam # Checks for unused function parameters
2929
- usestdlibvars # Checks for things that are provided by the standard library
30+
- usetesting # Reports usages of functions that have a replacement within the testing package
3031

3132
linters-settings:
3233
depguard:

‎cmd/config/validate_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ import (
2020
"bytes"
2121
"io"
2222
"os"
23+
"path/filepath"
2324
"testing"
2425

2526
"github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
2627
"github.com/stretchr/testify/assert"
28+
"github.com/stretchr/testify/require"
2729
"sigs.k8s.io/yaml"
2830
)
2931

@@ -75,10 +77,9 @@ func TestValidateCmd(t *testing.T) {
7577

7678
t.Run("malformed config from file", func(t *testing.T) {
7779
cmd := NewValidateCmd()
78-
tmpfile, _ := os.CreateTemp("", "testconfig")
79-
defer os.Remove(tmpfile.Name())
80-
_, _ = tmpfile.WriteString("malformed yaml")
81-
cmd.SetArgs([]string{"--config", tmpfile.Name()})
80+
tmpfile := filepath.Join(t.TempDir(), "testconfig")
81+
require.NoError(t, os.WriteFile(tmpfile, []byte("malformed yaml"), 0644))
82+
cmd.SetArgs([]string{"--config", tmpfile})
8283
errOut := bytes.NewBuffer(nil)
8384
cmd.SetErr(errOut)
8485
assert.ErrorContains(t, cmd.Execute(), "cannot unmarshal")
@@ -87,10 +88,9 @@ func TestValidateCmd(t *testing.T) {
8788

8889
t.Run("valid config from file", func(t *testing.T) {
8990
cmd := NewValidateCmd()
90-
tmpfile, _ := os.CreateTemp("", "testconfig")
91-
defer os.Remove(tmpfile.Name())
92-
_, _ = tmpfile.Write(validConfig())
93-
cmd.SetArgs([]string{"--config", tmpfile.Name()})
91+
tmpfile := filepath.Join(t.TempDir(), "testconfig")
92+
require.NoError(t, os.WriteFile(tmpfile, validConfig(), 0644))
93+
cmd.SetArgs([]string{"--config", tmpfile})
9494
errOut := bytes.NewBuffer(nil)
9595
cmd.SetErr(errOut)
9696
assert.NoError(t, cmd.Execute())

‎pkg/component/worker/ocibundle_test.go

+32-53
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package worker
1919
import (
2020
"encoding/json"
2121
"os"
22+
"path/filepath"
2223
"testing"
2324
"time"
2425

@@ -67,106 +68,84 @@ func TestSetImageSources(t *testing.T) {
6768
require.Empty(t, image.Labels)
6869

6970
// test setting one source
70-
fp, err := os.CreateTemp("", "test")
71-
require.NoError(t, err)
72-
defer func() {
73-
_ = fp.Close()
74-
_ = os.Remove(fp.Name())
75-
}()
76-
info, err := fp.Stat()
71+
test := filepath.Join(t.TempDir(), "test")
72+
require.NoError(t, os.WriteFile(test, nil, 0644))
73+
info, err := os.Stat(test)
7774
require.NoError(t, err)
7875
image = images.Image{}
79-
expected := ImageSources{fp.Name(): info.ModTime()}
76+
expected := ImageSources{test: info.ModTime()}
8077
err = SetImageSources(&image, expected)
8178
require.NoError(t, err)
8279
got, err := GetImageSources(image)
8380
require.NoError(t, err)
84-
require.True(t, expected[fp.Name()].Equal(got[fp.Name()]), "dates mismatch")
81+
require.True(t, expected[test].Equal(got[test]), "dates mismatch")
8582

8683
// test sources replacement
87-
img0, err := os.CreateTemp("", "test")
88-
require.NoError(t, err)
89-
defer func() {
90-
_ = img0.Close()
91-
_ = os.Remove(img0.Name())
92-
}()
93-
info0, err := img0.Stat()
84+
img0 := filepath.Join(t.TempDir(), "test")
85+
require.NoError(t, os.WriteFile(img0, nil, 0644))
86+
info0, err := os.Stat(img0)
9487
require.NoError(t, err)
9588

96-
data, err := json.Marshal(map[string]time.Time{img0.Name(): info0.ModTime()})
89+
data, err := json.Marshal(map[string]time.Time{img0: info0.ModTime()})
9790
require.NoError(t, err)
9891
image = images.Image{
9992
Labels: map[string]string{ImageSourcePathsLabel: string(data)},
10093
}
10194

102-
img1, err := os.CreateTemp("", "test")
103-
require.NoError(t, err)
104-
defer func() {
105-
_ = img1.Close()
106-
_ = os.Remove(img1.Name())
107-
}()
108-
info1, err := img1.Stat()
95+
img1 := filepath.Join(t.TempDir(), "test")
96+
require.NoError(t, os.WriteFile(img1, nil, 0644))
97+
info1, err := os.Stat(img1)
10998
require.NoError(t, err)
11099

111-
newsrc := ImageSources{img1.Name(): info1.ModTime()}
100+
newsrc := ImageSources{img1: info1.ModTime()}
112101
err = SetImageSources(&image, newsrc)
113102
require.NoError(t, err)
114103

115-
expected = ImageSources{img1.Name(): info1.ModTime()}
104+
expected = ImageSources{img1: info1.ModTime()}
116105
got, err = GetImageSources(image)
117106
require.NoError(t, err)
118-
require.True(t, expected[img1.Name()].Equal(got[img1.Name()]), "dates mismatch")
107+
require.True(t, expected[img1].Equal(got[img1]), "dates mismatch")
119108
}
120109

121110
func TestAddToImageSources(t *testing.T) {
122111
// test replacing sources
123-
img0, err := os.CreateTemp("", "test")
124-
require.NoError(t, err)
125-
defer func() {
126-
_ = img0.Close()
127-
_ = os.Remove(img0.Name())
128-
}()
129-
info0, err := img0.Stat()
112+
img0 := filepath.Join(t.TempDir(), "test")
113+
require.NoError(t, os.WriteFile(img0, nil, 0644))
114+
info0, err := os.Stat(img0)
130115
require.NoError(t, err)
131116

132-
data, err := json.Marshal(map[string]time.Time{img0.Name(): info0.ModTime()})
117+
data, err := json.Marshal(map[string]time.Time{img0: info0.ModTime()})
133118
require.NoError(t, err)
134119
image := images.Image{
135120
Labels: map[string]string{ImageSourcePathsLabel: string(data)},
136121
}
137122

138-
img1, err := os.CreateTemp("", "test")
139-
require.NoError(t, err)
140-
defer func() {
141-
_ = img1.Close()
142-
_ = os.Remove(img1.Name())
143-
}()
144-
info1, err := img1.Stat()
123+
img1 := filepath.Join(t.TempDir(), "test")
124+
require.NoError(t, os.WriteFile(img1, nil, 0644))
125+
info1, err := os.Stat(img0)
145126
require.NoError(t, err)
146127

147-
err = AddToImageSources(&image, img1.Name(), info1.ModTime())
128+
err = AddToImageSources(&image, img1, info1.ModTime())
148129
require.NoError(t, err)
149130

150131
expected := ImageSources{
151-
img0.Name(): info0.ModTime(),
152-
img1.Name(): info1.ModTime(),
132+
img0: info0.ModTime(),
133+
img1: info1.ModTime(),
153134
}
154135
got, err := GetImageSources(image)
155136
require.NoError(t, err)
156-
require.True(t, expected[img0.Name()].Equal(got[img0.Name()]), "dates mismatch")
157-
require.True(t, expected[img1.Name()].Equal(got[img1.Name()]), "dates mismatch")
137+
require.True(t, expected[img0].Equal(got[img0]), "dates mismatch")
138+
require.True(t, expected[img1].Equal(got[img1]), "dates mismatch")
158139

159140
// test if it trims the sources
160-
err = img0.Close()
161-
require.NoError(t, err)
162-
err = os.Remove(img0.Name())
141+
err = os.Remove(img0)
163142
require.NoError(t, err)
164143

165-
err = AddToImageSources(&image, img1.Name(), info1.ModTime())
144+
err = AddToImageSources(&image, img1, info1.ModTime())
166145
require.NoError(t, err)
167146

168-
expected = ImageSources{img1.Name(): info1.ModTime()}
147+
expected = ImageSources{img1: info1.ModTime()}
169148
got, err = GetImageSources(image)
170149
require.NoError(t, err)
171-
require.True(t, expected[img1.Name()].Equal(got[img1.Name()]), "dates mismatch")
150+
require.True(t, expected[img1].Equal(got[img1]), "dates mismatch")
172151
}

0 commit comments

Comments
 (0)