Skip to content

Commit 1a3963b

Browse files
committed
lint: temp dir
* add 'usetesting' linter Signed-off-by: Alex Aizman <[email protected]>
1 parent 87af45c commit 1a3963b

File tree

7 files changed

+14
-31
lines changed

7 files changed

+14
-31
lines changed

.golangci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ linters:
2222
- gosec
2323
- gosimple
2424
- govet
25+
# iface
2526
- importas
2627
- ineffassign
2728
- intrange
@@ -32,13 +33,15 @@ linters:
3233
- prealloc
3334
- protogetter
3435
- reassign
36+
# recvcheck
3537
- revive
3638
- staticcheck
3739
- testpackage
3840
- typecheck
3941
- unconvert
4042
- unparam
4143
- unused
44+
- usetesting
4245
- whitespace
4346

4447
# See: https://golangci-lint.run/usage/linters/

ais/test/promote_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"fmt"
99
iofs "io/fs"
1010
"math/rand/v2"
11-
"os"
1211
"os/exec"
1312
"path/filepath"
1413
"strings"
@@ -129,17 +128,15 @@ func (test *prmTests) do(t *testing.T, bck *meta.Bck) {
129128
)
130129
m.saveCluState(m.proxyURL)
131130

132-
tempdir, err := os.MkdirTemp("", "prm")
133-
tassert.CheckFatal(t, err)
131+
tempdir := t.TempDir()
134132
subdirFQN := filepath.Join(tempdir, subdir)
135-
err = cos.CreateDir(subdirFQN)
133+
err := cos.CreateDir(subdirFQN)
136134
tassert.CheckFatal(t, err)
137135

138136
if m.bck.IsRemote() {
139137
m.del()
140138
}
141139
t.Cleanup(func() {
142-
_ = os.RemoveAll(tempdir)
143140
if m.bck.IsRemote() {
144141
m.del()
145142
}

ais/test/scripted_cli_test.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package integration_test
66

77
import (
88
"fmt"
9-
"os"
109
"os/exec"
1110
"sort"
1211
"strconv"
@@ -153,12 +152,7 @@ func TestMultipartUploadUsingScript(t *testing.T) {
153152
Long: true,
154153
})
155154

156-
tempdir, err := os.MkdirTemp("", "s3-mpt")
157-
tassert.CheckFatal(t, err)
158-
t.Cleanup(func() {
159-
_ = os.RemoveAll(tempdir)
160-
})
161-
155+
tempdir := t.TempDir()
162156
bck := cmn.Bck{Name: trand.String(10), Provider: apc.AIS}
163157

164158
// 1. set MD5 to satisfy `s3cmd` (for details, see docs/s3cmd.md & docs/s3compat.md)
@@ -238,11 +232,7 @@ func TestRemaisDeleteUsingScript(t *testing.T) {
238232
remaisScript = "./scripts/remais-del-list-deleted.sh"
239233
)
240234
// 1. create temp root
241-
root, err := os.MkdirTemp("", "ais-lpi-")
242-
tassert.CheckFatal(t, err)
243-
defer func() {
244-
os.RemoveAll(root)
245-
}()
235+
root := t.TempDir()
246236

247237
//
248238
// 2. script #1: generate

ais/tgtobj.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,7 @@ fin:
741741
if !retried {
742742
nlog.Warningln("retrying", goi.lom.String(), err)
743743
retried = true
744+
cold = false
744745
goto do
745746
}
746747
}

fs/lpi_test.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ package fs_test
88
import (
99
"fmt"
1010
"math/rand/v2"
11-
"os"
1211
"os/exec"
1312
"strconv"
1413
"strings"
@@ -29,13 +28,7 @@ const (
2928

3029
func TestLocalPageIterator(t *testing.T) {
3130
// 1. create temp root
32-
root, err := os.MkdirTemp("", "ais-lpi-")
33-
tassert.CheckFatal(t, err)
34-
defer func() {
35-
if !t.Failed() {
36-
os.RemoveAll(root)
37-
}
38-
}()
31+
root := t.TempDir()
3932

4033
// 2. generate
4134
cmd := exec.Command(lpiTestScript, "--root_dir", root)

fs/walk_test.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,9 @@ func TestWalkBck(t *testing.T) {
4747
}()
4848

4949
for range test.mpathCnt {
50-
mpath, err := os.MkdirTemp("", "testwalk")
51-
tassert.CheckFatal(t, err)
50+
mpath := t.TempDir()
5251

53-
err = cos.CreateDir(mpath)
52+
err := cos.CreateDir(mpath)
5453
tassert.CheckFatal(t, err)
5554

5655
_, err = fs.Add(mpath, "daeID")
@@ -133,10 +132,9 @@ func TestWalkBckSkipDir(t *testing.T) {
133132
}()
134133

135134
for range mpathCnt {
136-
mpath, err := os.MkdirTemp("", "testwalk")
137-
tassert.CheckFatal(t, err)
135+
mpath := t.TempDir()
138136

139-
err = cos.CreateDir(mpath)
137+
err := cos.CreateDir(mpath)
140138
tassert.CheckFatal(t, err)
141139

142140
_, err = fs.Add(mpath, "daeID")

tools/file.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//nolint:usetesting // need mkdir(dir = bdir)
12
// Package tools provides common tools and utilities for all unit and integration tests
23
/*
34
* Copyright (c) 2018-2024, NVIDIA CORPORATION. All rights reserved.

0 commit comments

Comments
 (0)