Skip to content

Commit 10f385a

Browse files
FabianKrammFabianKramm
authored
Merge pull request #1912 from Juneezee/test/t.TempDir
test: use `T.TempDir` to create temporary test directory
2 parents 1fe242f + 884787f commit 10f385a

File tree

19 files changed

+43
-309
lines changed

19 files changed

+43
-309
lines changed

‎helper/server/downstream_test.go‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,10 @@ import (
1717
)
1818

1919
func TestDownstreamServer(t *testing.T) {
20-
fromDir, err := ioutil.TempDir("", "")
21-
if err != nil {
22-
t.Fatal(err)
23-
}
24-
toDir, err := ioutil.TempDir("", "")
25-
if err != nil {
26-
t.Fatal(err)
27-
}
28-
29-
defer os.RemoveAll(fromDir)
30-
defer os.RemoveAll(toDir)
20+
fromDir := t.TempDir()
21+
toDir := t.TempDir()
3122

32-
err = createFiles(fromDir, fileStructure)
23+
err := createFiles(fromDir, fileStructure)
3324
if err != nil {
3425
t.Fatal(err)
3526
}

‎helper/server/upstream_test.go‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -142,19 +142,10 @@ func createFiles(dir string, file testFile) error {
142142
}
143143

144144
func TestUpstreamServer(t *testing.T) {
145-
fromDir, err := ioutil.TempDir("", "")
146-
if err != nil {
147-
t.Fatal(err)
148-
}
149-
toDir, err := ioutil.TempDir("", "")
150-
if err != nil {
151-
t.Fatal(err)
152-
}
153-
154-
defer os.RemoveAll(fromDir)
155-
defer os.RemoveAll(toDir)
145+
fromDir := t.TempDir()
146+
toDir := t.TempDir()
156147

157-
err = createFiles(fromDir, fileStructure)
148+
err := createFiles(fromDir, fileStructure)
158149
if err != nil {
159150
t.Fatal(err)
160151
}

‎pkg/devspace/build/builder/helper/util_test.go‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package helper
22

33
import (
4-
"io/ioutil"
54
"os"
65
"testing"
76

@@ -12,10 +11,7 @@ import (
1211

1312
func TestCreateTempDockerfile(t *testing.T) {
1413
//Create tempDir and go into it
15-
dir, err := ioutil.TempDir("", "testDir")
16-
if err != nil {
17-
t.Fatalf("Error creating temporary directory: %v", err)
18-
}
14+
dir := t.TempDir()
1915

2016
wdBackup, err := os.Getwd()
2117
if err != nil {
@@ -32,10 +28,6 @@ func TestCreateTempDockerfile(t *testing.T) {
3228
if err != nil {
3329
t.Fatalf("Error changing dir back: %v", err)
3430
}
35-
err = os.RemoveAll(dir)
36-
if err != nil {
37-
t.Fatalf("Error removing dir: %v", err)
38-
}
3931
}()
4032

4133
err = fsutil.WriteToFile([]byte(""), "Exists")

‎pkg/devspace/config/generated/config_test.go‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ func TestLoad(t *testing.T) {
3939
},
4040
}
4141

42-
dir, err := ioutil.TempDir("", "test")
43-
if err != nil {
44-
t.Fatalf("Error creating temporary directory: %v", err)
45-
}
42+
dir := t.TempDir()
4643

4744
wdBackup, err := os.Getwd()
4845
if err != nil {
@@ -59,10 +56,6 @@ func TestLoad(t *testing.T) {
5956
if err != nil {
6057
t.Fatalf("Error changing dir back: %v", err)
6158
}
62-
err = os.RemoveAll(dir)
63-
if err != nil {
64-
t.Fatalf("Error removing dir: %v", err)
65-
}
6659
}()
6760

6861
for _, testCase := range testCases {
@@ -152,10 +145,7 @@ func TestSave(t *testing.T) {
152145
},
153146
}
154147

155-
dir, err := ioutil.TempDir("", "test")
156-
if err != nil {
157-
t.Fatalf("Error creating temporary directory: %v", err)
158-
}
148+
dir := t.TempDir()
159149

160150
wdBackup, err := os.Getwd()
161151
if err != nil {
@@ -172,10 +162,6 @@ func TestSave(t *testing.T) {
172162
if err != nil {
173163
t.Fatalf("Error changing dir back: %v", err)
174164
}
175-
err = os.RemoveAll(dir)
176-
if err != nil {
177-
t.Fatalf("Error removing dir: %v", err)
178-
}
179165
}()
180166

181167
for _, testCase := range testCases {

‎pkg/devspace/config/loader/loader_test.go‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ func TestExists(t *testing.T) {
5252
},
5353
}
5454

55-
dir, err := ioutil.TempDir("", "test")
56-
if err != nil {
57-
t.Fatalf("Error creating temporary directory: %v", err)
58-
}
55+
dir := t.TempDir()
5956

6057
wdBackup, err := os.Getwd()
6158
if err != nil {
@@ -72,10 +69,6 @@ func TestExists(t *testing.T) {
7269
if err != nil {
7370
t.Fatalf("Error changing dir back: %v", err)
7471
}
75-
err = os.RemoveAll(dir)
76-
if err != nil {
77-
t.Fatalf("Error removing dir: %v", err)
78-
}
7972
}()
8073

8174
for _, testCase := range testCases {
@@ -198,10 +191,7 @@ func TestLoad(t *testing.T) {
198191
},
199192
}
200193

201-
dir, err := ioutil.TempDir("", "test")
202-
if err != nil {
203-
t.Fatalf("Error creating temporary directory: %v", err)
204-
}
194+
dir := t.TempDir()
205195

206196
wdBackup, err := os.Getwd()
207197
if err != nil {
@@ -218,10 +208,6 @@ func TestLoad(t *testing.T) {
218208
if err != nil {
219209
t.Fatalf("Error changing dir back: %v", err)
220210
}
221-
err = os.RemoveAll(dir)
222-
if err != nil {
223-
t.Fatalf("Error removing dir: %v", err)
224-
}
225211
}()
226212

227213
for _, testCase := range testCases {
@@ -282,10 +268,7 @@ type setDevSpaceRootTestCase struct {
282268
}
283269

284270
func TestSetDevSpaceRoot(t *testing.T) {
285-
dir, err := ioutil.TempDir("", "test")
286-
if err != nil {
287-
t.Fatalf("Error creating temporary directory: %v", err)
288-
}
271+
dir := t.TempDir()
289272

290273
wdBackup, err := os.Getwd()
291274
if err != nil {
@@ -302,10 +285,6 @@ func TestSetDevSpaceRoot(t *testing.T) {
302285
if err != nil {
303286
t.Fatalf("Error changing dir back: %v", err)
304287
}
305-
err = os.RemoveAll(dir)
306-
if err != nil {
307-
t.Fatalf("Error removing dir: %v", err)
308-
}
309288
}()
310289

311290
testCases := []setDevSpaceRootTestCase{
@@ -435,10 +414,7 @@ func TestGetProfiles(t *testing.T) {
435414
},
436415
}
437416

438-
dir, err := ioutil.TempDir("", "test")
439-
if err != nil {
440-
t.Fatalf("Error creating temporary directory: %v", err)
441-
}
417+
dir := t.TempDir()
442418

443419
wdBackup, err := os.Getwd()
444420
if err != nil {
@@ -455,10 +431,6 @@ func TestGetProfiles(t *testing.T) {
455431
if err != nil {
456432
t.Fatalf("Error changing dir back: %v", err)
457433
}
458-
err = os.RemoveAll(dir)
459-
if err != nil {
460-
t.Fatalf("Error removing dir: %v", err)
461-
}
462434
}()
463435

464436
for _, testCase := range testCases {

‎pkg/devspace/dependency/dependency_test.go‎

Lines changed: 8 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package dependency
22

33
import (
4-
"github.com/loft-sh/devspace/pkg/devspace/dependency/types"
5-
"io/ioutil"
64
"os"
75
"path/filepath"
86
"testing"
97

8+
"github.com/loft-sh/devspace/pkg/devspace/dependency/types"
9+
1010
"github.com/loft-sh/devspace/pkg/devspace/build"
1111
fakebuild "github.com/loft-sh/devspace/pkg/devspace/build/testing"
1212
"github.com/loft-sh/devspace/pkg/devspace/config"
@@ -89,10 +89,7 @@ func TestUpdateAll(t *testing.T) {
8989
},
9090
}
9191

92-
dir, err := ioutil.TempDir("", "testFolder")
93-
if err != nil {
94-
t.Fatalf("Error creating temporary directory: %v", err)
95-
}
92+
dir := t.TempDir()
9693

9794
wdBackup, err := os.Getwd()
9895
if err != nil {
@@ -109,10 +106,6 @@ func TestUpdateAll(t *testing.T) {
109106
if err != nil {
110107
t.Fatalf("Error changing dir back: %v", err)
111108
}
112-
err = os.RemoveAll(dir)
113-
if err != nil {
114-
t.Fatalf("Error removing dir: %v", err)
115-
}
116109
}()
117110

118111
for _, testCase := range testCases {
@@ -163,10 +156,7 @@ type buildAllTestCase struct {
163156
}
164157

165158
func TestBuildAll(t *testing.T) {
166-
dir, err := ioutil.TempDir("", "testFolder")
167-
if err != nil {
168-
t.Fatalf("Error creating temporary directory: %v", err)
169-
}
159+
dir := t.TempDir()
170160

171161
wdBackup, err := os.Getwd()
172162
if err != nil {
@@ -176,21 +166,13 @@ func TestBuildAll(t *testing.T) {
176166
if err != nil {
177167
t.Fatalf("Error changing working directory: %v", err)
178168
}
179-
dir, err = filepath.EvalSymlinks(dir)
180-
if err != nil {
181-
t.Fatal(err)
182-
}
183169

184170
// Delete temp folder
185171
defer func() {
186172
err = os.Chdir(wdBackup)
187173
if err != nil {
188174
t.Fatalf("Error changing dir back: %v", err)
189175
}
190-
err = os.RemoveAll(dir)
191-
if err != nil {
192-
t.Fatalf("Error removing dir: %v", err)
193-
}
194176
}()
195177

196178
testCases := []buildAllTestCase{
@@ -264,10 +246,7 @@ type deployAllTestCase struct {
264246
}
265247

266248
func TestDeployAll(t *testing.T) {
267-
dir, err := ioutil.TempDir("", "testFolder")
268-
if err != nil {
269-
t.Fatalf("Error creating temporary directory: %v", err)
270-
}
249+
dir := t.TempDir()
271250

272251
wdBackup, err := os.Getwd()
273252
if err != nil {
@@ -277,21 +256,13 @@ func TestDeployAll(t *testing.T) {
277256
if err != nil {
278257
t.Fatalf("Error changing working directory: %v", err)
279258
}
280-
dir, err = filepath.EvalSymlinks(dir)
281-
if err != nil {
282-
t.Fatal(err)
283-
}
284259

285260
// Delete temp folder
286261
defer func() {
287262
err = os.Chdir(wdBackup)
288263
if err != nil {
289264
t.Fatalf("Error changing dir back: %v", err)
290265
}
291-
err = os.RemoveAll(dir)
292-
if err != nil {
293-
t.Fatalf("Error removing dir: %v", err)
294-
}
295266
}()
296267

297268
testCases := []deployAllTestCase{
@@ -365,11 +336,7 @@ type purgeAllTestCase struct {
365336
}
366337

367338
func TestPurgeAll(t *testing.T) {
368-
dir, err := ioutil.TempDir("", "testFolder")
369-
if err != nil {
370-
t.Fatalf("Error creating temporary directory: %v", err)
371-
}
372-
dir, err = filepath.EvalSymlinks(dir)
339+
dir, err := filepath.EvalSymlinks(t.TempDir())
373340
if err != nil {
374341
t.Fatal(err)
375342
}
@@ -389,10 +356,6 @@ func TestPurgeAll(t *testing.T) {
389356
if err != nil {
390357
t.Fatalf("Error changing dir back: %v", err)
391358
}
392-
err = os.RemoveAll(dir)
393-
if err != nil {
394-
t.Fatalf("Error removing dir: %v", err)
395-
}
396359
}()
397360

398361
testCases := []purgeAllTestCase{
@@ -470,11 +433,7 @@ type buildTestCase struct {
470433
}
471434

472435
func TestBuild(t *testing.T) {
473-
dir, err := ioutil.TempDir("", "testFolder")
474-
if err != nil {
475-
t.Fatalf("Error creating temporary directory: %v", err)
476-
}
477-
dir, err = filepath.EvalSymlinks(dir)
436+
dir, err := filepath.EvalSymlinks(t.TempDir())
478437
if err != nil {
479438
t.Fatal(err)
480439
}
@@ -494,10 +453,6 @@ func TestBuild(t *testing.T) {
494453
if err != nil {
495454
t.Fatalf("Error changing dir back: %v", err)
496455
}
497-
err = os.RemoveAll(dir)
498-
if err != nil {
499-
t.Fatalf("Error removing dir: %v", err)
500-
}
501456
}()
502457

503458
testCases := []buildTestCase{
@@ -591,11 +546,7 @@ type deployTestCase struct {
591546
}
592547

593548
func TestDeploy(t *testing.T) {
594-
dir, err := ioutil.TempDir("", "testFolder")
595-
if err != nil {
596-
t.Fatalf("Error creating temporary directory: %v", err)
597-
}
598-
dir, err = filepath.EvalSymlinks(dir)
549+
dir, err := filepath.EvalSymlinks(t.TempDir())
599550
if err != nil {
600551
t.Fatal(err)
601552
}
@@ -615,10 +566,6 @@ func TestDeploy(t *testing.T) {
615566
if err != nil {
616567
t.Fatalf("Error changing dir back: %v", err)
617568
}
618-
err = os.RemoveAll(dir)
619-
if err != nil {
620-
t.Fatalf("Error removing dir: %v", err)
621-
}
622569
}()
623570

624571
testCases := []deployTestCase{

0 commit comments

Comments
 (0)