Skip to content

Commit 107da95

Browse files
committed
Add golangci-lint v2 config and fix test idioms
Add .golangci.yml to configure linter for v2: exclude Close/Remove from errcheck, disable pedantic staticcheck rules. Use t.Setenv instead of manual os.Setenv/defer in tests.
1 parent db0d25c commit 107da95

File tree

3 files changed

+26
-25
lines changed

3 files changed

+26
-25
lines changed

.golangci.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
version: "2"
2+
3+
linters:
4+
default: standard
5+
settings:
6+
staticcheck:
7+
checks:
8+
- "all"
9+
- "-ST1000"
10+
- "-ST1003"
11+
- "-QF*"
12+
exclusions:
13+
rules:
14+
- text: "Error return value of .+Close"
15+
linters: [errcheck]
16+
- text: "Error return value of `os.Remove`"
17+
linters: [errcheck]

internal/cache/cache_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestHashURL(t *testing.T) {
2929
}
3030

3131
for _, c := range result {
32-
if !((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f')) {
32+
if (c < '0' || c > '9') && (c < 'a' || c > 'f') {
3333
t.Errorf("hashURL(%q) contains non-hex character: %c", tt.url, c)
3434
}
3535
}

internal/config/config_test.go

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ func TestDefaultConfig(t *testing.T) {
2424

2525
func TestConfigSaveAndLoad(t *testing.T) {
2626
tmpDir := t.TempDir()
27-
originalHome := os.Getenv("HOME")
28-
os.Setenv("HOME", tmpDir)
29-
defer os.Setenv("HOME", originalHome)
27+
t.Setenv("HOME", tmpDir)
3028

3129
testCfg := &Config{
3230
Volume: 85,
@@ -59,9 +57,7 @@ func TestConfigSaveAndLoad(t *testing.T) {
5957

6058
func TestLoadNonExistentConfig(t *testing.T) {
6159
tmpDir := t.TempDir()
62-
originalHome := os.Getenv("HOME")
63-
os.Setenv("HOME", tmpDir)
64-
defer os.Setenv("HOME", originalHome)
60+
t.Setenv("HOME", tmpDir)
6561

6662
cfg, err := Load()
6763
if err != nil {
@@ -94,9 +90,7 @@ func TestVolumeValidation(t *testing.T) {
9490
for _, tt := range tests {
9591
t.Run(tt.name, func(t *testing.T) {
9692
tmpDir := t.TempDir()
97-
originalHome := os.Getenv("HOME")
98-
os.Setenv("HOME", tmpDir)
99-
defer os.Setenv("HOME", originalHome)
93+
t.Setenv("HOME", tmpDir)
10094

10195
testCfg := &Config{
10296
Volume: tt.inputVolume,
@@ -122,9 +116,7 @@ func TestVolumeValidation(t *testing.T) {
122116

123117
func TestThemeDefaults(t *testing.T) {
124118
tmpDir := t.TempDir()
125-
originalHome := os.Getenv("HOME")
126-
os.Setenv("HOME", tmpDir)
127-
defer os.Setenv("HOME", originalHome)
119+
t.Setenv("HOME", tmpDir)
128120

129121
cfg, err := Load()
130122
if err != nil {
@@ -150,9 +142,7 @@ func TestThemeDefaults(t *testing.T) {
150142

151143
func TestThemePersistence(t *testing.T) {
152144
tmpDir := t.TempDir()
153-
originalHome := os.Getenv("HOME")
154-
os.Setenv("HOME", tmpDir)
155-
defer os.Setenv("HOME", originalHome)
145+
t.Setenv("HOME", tmpDir)
156146

157147
testCfg := &Config{
158148
Volume: 70,
@@ -414,9 +404,7 @@ func TestGetColor(t *testing.T) {
414404

415405
func TestFavoritesPersistence(t *testing.T) {
416406
tmpDir := t.TempDir()
417-
originalHome := os.Getenv("HOME")
418-
os.Setenv("HOME", tmpDir)
419-
defer os.Setenv("HOME", originalHome)
407+
t.Setenv("HOME", tmpDir)
420408

421409
testCfg := &Config{
422410
Volume: 70,
@@ -448,9 +436,7 @@ func TestFavoritesPersistence(t *testing.T) {
448436

449437
func TestAutostartPersistence(t *testing.T) {
450438
tmpDir := t.TempDir()
451-
originalHome := os.Getenv("HOME")
452-
os.Setenv("HOME", tmpDir)
453-
defer os.Setenv("HOME", originalHome)
439+
t.Setenv("HOME", tmpDir)
454440

455441
testCfg := &Config{
456442
Volume: 70,
@@ -476,9 +462,7 @@ func TestAutostartPersistence(t *testing.T) {
476462

477463
func TestLoadInvalidYAML(t *testing.T) {
478464
tmpDir := t.TempDir()
479-
originalHome := os.Getenv("HOME")
480-
os.Setenv("HOME", tmpDir)
481-
defer os.Setenv("HOME", originalHome)
465+
t.Setenv("HOME", tmpDir)
482466

483467
configDir := filepath.Join(tmpDir, ConfigDir)
484468
_ = os.MkdirAll(configDir, 0755)

0 commit comments

Comments
 (0)