fork of https://github.com/sourcegraph/zoekt
tests: replace ioutil.TempDir with testing.T.TempDir (#359)
testing.T.TempDir was introduced in Go 1.15 (August 2020) and
the majority of tests had been written earlier.
author
Maxim Pimenov
committer
GitHub
date
(May 31, 2022, 11:50 AM +0300)
commit
c16eb041
c16eb04173b7fab652f0524912c3553dfd1382e1
parent
6ca5909b
6ca5909b5050d78dd7bda42f475fb086160804b0
+43
-170
+5
-25
build/e2e_test.go
+5
-25
build/e2e_test.go
···
197
197
}
198
198
199
199
func TestLargeFileOption(t *testing.T) {
200
-
dir, err := ioutil.TempDir("", "large_files_test")
201
-
if err != nil {
202
-
t.Fatalf("TempDir: %v", err)
203
-
}
204
-
defer os.RemoveAll(dir)
200
+
dir := t.TempDir()
205
201
206
202
sizeMax := 1000
207
203
opts := Options{
···
253
249
}
254
250
255
251
func TestUpdate(t *testing.T) {
256
-
dir, err := ioutil.TempDir("", "")
257
-
if err != nil {
258
-
t.Fatalf("TempDir: %v", err)
259
-
}
260
-
defer os.RemoveAll(dir)
252
+
dir := t.TempDir()
261
253
262
254
opts := Options{
263
255
IndexDir: dir,
···
350
342
}
351
343
352
344
func TestDeleteOldShards(t *testing.T) {
353
-
dir, err := ioutil.TempDir("", "")
354
-
if err != nil {
355
-
t.Fatalf("TempDir: %v", err)
356
-
}
357
-
defer os.RemoveAll(dir)
345
+
dir := t.TempDir()
358
346
359
347
opts := Options{
360
348
IndexDir: dir,
···
437
425
}
438
426
439
427
func TestPartialSuccess(t *testing.T) {
440
-
dir, err := ioutil.TempDir("", "")
441
-
if err != nil {
442
-
t.Fatalf("TempDir: %v", err)
443
-
}
444
-
defer os.RemoveAll(dir)
428
+
dir := t.TempDir()
445
429
446
430
opts := Options{
447
431
IndexDir: dir,
···
551
535
}
552
536
553
537
func TestEmptyContent(t *testing.T) {
554
-
dir, err := ioutil.TempDir("", "")
555
-
if err != nil {
556
-
t.Fatalf("TempDir: %v", err)
557
-
}
558
-
defer os.RemoveAll(dir)
538
+
dir := t.TempDir()
559
539
560
540
opts := Options{
561
541
IndexDir: dir,
+5
-8
cmd/zoekt-archive-index/e2e_test.go
+5
-8
cmd/zoekt-archive-index/e2e_test.go
···
96
96
}
97
97
98
98
func testIndexIncrementally(t *testing.T, format string) {
99
-
indexdir, err := ioutil.TempDir("", "TestIndexArg-index")
100
-
if err != nil {
101
-
t.Fatalf("TempDir: %v", err)
102
-
}
103
-
defer os.RemoveAll(indexdir)
99
+
indexDir := t.TempDir()
100
+
104
101
archive, err := ioutil.TempFile("", "TestIndexArg-archive")
105
102
if err != nil {
106
103
t.Fatalf("TempFile: %v", err)
···
142
139
143
140
bopts := build.Options{
144
141
SizeMax: fileSize - 1,
145
-
IndexDir: indexdir,
142
+
IndexDir: indexDir,
146
143
LargeFiles: largeFiles,
147
144
}
148
145
opts := Options{
···
158
155
t.Fatalf("error creating index: %v", err)
159
156
}
160
157
161
-
ss, err := shards.NewDirectorySearcher(indexdir)
158
+
ss, err := shards.NewDirectorySearcher(indexDir)
162
159
if err != nil {
163
-
t.Fatalf("NewDirectorySearcher(%s): %v", indexdir, err)
160
+
t.Fatalf("NewDirectorySearcher(%s): %v", indexDir, err)
164
161
}
165
162
defer ss.Close()
166
163
+2
-10
cmd/zoekt-sourcegraph-indexserver/cleanup_test.go
+2
-10
cmd/zoekt-sourcegraph-indexserver/cleanup_test.go
···
114
114
115
115
for _, tt := range cases {
116
116
t.Run(tt.name, func(t *testing.T) {
117
-
dir, err := ioutil.TempDir("", "TestCleanup")
118
-
if err != nil {
119
-
t.Fatal(err)
120
-
}
121
-
defer os.RemoveAll(dir)
117
+
dir := t.TempDir()
122
118
123
119
// Create index files
124
120
var fs []shard
···
221
217
}
222
218
sort.Strings(shards)
223
219
224
-
dir, err := ioutil.TempDir("", "TestRemoveIncompleteShards")
225
-
if err != nil {
226
-
t.Fatal(err)
227
-
}
228
-
defer os.RemoveAll(dir)
220
+
dir := t.TempDir()
229
221
230
222
for _, shard := range append(shards, incomplete...) {
231
223
_, err := os.Create(filepath.Join(dir, shard))
+2
-7
gitindex/clone_test.go
+2
-7
gitindex/clone_test.go
···
15
15
package gitindex
16
16
17
17
import (
18
-
"io/ioutil"
19
-
"os"
20
18
"os/exec"
21
19
"testing"
22
20
···
24
22
)
25
23
26
24
func TestSetRemote(t *testing.T) {
27
-
dir, err := ioutil.TempDir("", "")
28
-
if err != nil {
29
-
t.Fatal(err)
30
-
}
31
-
defer os.RemoveAll(dir)
25
+
dir := t.TempDir()
26
+
32
27
script := `mkdir orig
33
28
cd orig
34
29
git init
+1
-7
gitindex/delete_test.go
+1
-7
gitindex/delete_test.go
···
1
1
package gitindex
2
2
3
3
import (
4
-
"io/ioutil"
5
4
"net/url"
6
-
"os"
7
5
"path/filepath"
8
6
"reflect"
9
7
"testing"
10
8
)
11
9
12
10
func TestDeleteRepos(t *testing.T) {
13
-
dir, err := ioutil.TempDir("", "")
14
-
if err != nil {
15
-
t.Fatalf("TempDir: %v", err)
16
-
}
17
-
defer os.RemoveAll(dir)
11
+
dir := t.TempDir()
18
12
19
13
if err := createSubmoduleRepo(dir); err != nil {
20
14
t.Error("createSubmoduleRepo", err)
+2
-11
gitindex/ignore_test.go
+2
-11
gitindex/ignore_test.go
···
3
3
import (
4
4
"context"
5
5
"fmt"
6
-
"io/ioutil"
7
6
"os"
8
7
"os/exec"
9
8
"path/filepath"
···
50
49
}
51
50
52
51
func TestIgnore(t *testing.T) {
53
-
dir, err := ioutil.TempDir("", "")
54
-
if err != nil {
55
-
t.Fatalf("TempDir: %v", err)
56
-
}
57
-
defer os.RemoveAll(dir)
52
+
dir := t.TempDir()
58
53
59
54
if err := createSourcegraphignoreRepo(dir); err != nil {
60
55
t.Fatalf("createSourcegraphignoreRepo: %v", err)
61
56
}
62
57
63
-
indexDir, err := ioutil.TempDir("", "")
64
-
if err != nil {
65
-
t.Fatal(err)
66
-
}
67
-
defer os.RemoveAll(indexDir)
58
+
indexDir := t.TempDir()
68
59
69
60
buildOpts := build.Options{
70
61
IndexDir: indexDir,
+4
-9
gitindex/index_test.go
+4
-9
gitindex/index_test.go
···
18
18
"bytes"
19
19
"context"
20
20
"fmt"
21
-
"io/ioutil"
22
21
"os"
23
22
"os/exec"
24
23
"path/filepath"
···
37
36
)
38
37
39
38
func TestIndexEmptyRepo(t *testing.T) {
40
-
tmp, err := ioutil.TempDir("", "")
41
-
if err != nil {
42
-
t.Fatalf("TempDir %v", err)
43
-
}
44
-
defer os.RemoveAll(tmp)
39
+
dir := t.TempDir()
45
40
46
41
cmd := exec.Command("git", "init", "-b", "master", "repo")
47
-
cmd.Dir = tmp
42
+
cmd.Dir = dir
48
43
49
44
if err := cmd.Run(); err != nil {
50
45
t.Fatalf("cmd.Run: %v", err)
···
54
49
Name: "repo",
55
50
}
56
51
opts := Options{
57
-
RepoDir: filepath.Join(tmp, "repo", ".git"),
52
+
RepoDir: filepath.Join(dir, "repo", ".git"),
58
53
BuildOptions: build.Options{
59
54
RepositoryDescription: desc,
60
-
IndexDir: tmp,
55
+
IndexDir: dir,
61
56
},
62
57
}
63
58
+4
-9
gitindex/repocache_test.go
+4
-9
gitindex/repocache_test.go
···
15
15
package gitindex
16
16
17
17
import (
18
-
"io/ioutil"
19
18
"net/url"
20
-
"os"
21
19
"reflect"
22
20
"sort"
23
21
"testing"
···
36
34
}
37
35
38
36
func TestListRepos(t *testing.T) {
39
-
tmp, err := ioutil.TempDir("", "")
40
-
if err != nil {
41
-
t.Fatalf("TempDir %v", err)
42
-
}
43
-
defer os.RemoveAll(tmp)
44
-
if err := createSubmoduleRepo(tmp); err != nil {
37
+
dir := t.TempDir()
38
+
39
+
if err := createSubmoduleRepo(dir); err != nil {
45
40
t.Fatalf("createSubmoduleRepo %v", err)
46
41
}
47
42
···
49
44
if err != nil {
50
45
t.Fatalf("url.Parse: %v", err)
51
46
}
52
-
rs, err := ListRepos(tmp, u)
47
+
rs, err := ListRepos(dir, u)
53
48
if err != nil {
54
49
t.Fatalf("ListRepos(%s): %v", u, err)
55
50
}
+15
-71
gitindex/tree_test.go
+15
-71
gitindex/tree_test.go
···
18
18
"bytes"
19
19
"context"
20
20
"fmt"
21
-
"io/ioutil"
22
21
"net/url"
23
22
"os"
24
23
"os/exec"
···
99
98
}
100
99
101
100
func TestFindGitRepos(t *testing.T) {
102
-
dir, err := ioutil.TempDir("", "")
103
-
if err != nil {
104
-
t.Fatalf("TempDir: %v", err)
105
-
}
106
-
defer os.RemoveAll(dir)
101
+
dir := t.TempDir()
107
102
108
103
if err := createSubmoduleRepo(dir); err != nil {
109
104
t.Error("createSubmoduleRepo", err)
···
138
133
}
139
134
140
135
func TestTreeToFiles(t *testing.T) {
141
-
dir, err := ioutil.TempDir("", "")
142
-
if err != nil {
143
-
t.Fatalf("TempDir: %v", err)
144
-
}
145
-
defer os.RemoveAll(dir)
136
+
dir := t.TempDir()
146
137
147
138
if err := createSubmoduleRepo(dir); err != nil {
148
139
t.Fatalf("TempDir: %v", err)
···
195
186
}
196
187
197
188
func TestSubmoduleIndex(t *testing.T) {
198
-
dir, err := ioutil.TempDir("", "")
199
-
if err != nil {
200
-
t.Fatalf("TempDir: %v", err)
201
-
}
202
-
defer os.RemoveAll(dir)
189
+
dir := t.TempDir()
203
190
204
191
if err := createSubmoduleRepo(dir); err != nil {
205
192
t.Fatalf("createSubmoduleRepo: %v", err)
206
193
}
207
194
208
-
indexDir, err := ioutil.TempDir("", "")
209
-
if err != nil {
210
-
t.Fatal(err)
211
-
}
212
-
defer os.RemoveAll(indexDir)
195
+
indexDir := t.TempDir()
213
196
214
197
buildOpts := build.Options{
215
198
IndexDir: indexDir,
···
307
290
}
308
291
309
292
func TestSearchSymlinkByContent(t *testing.T) {
310
-
dir, err := ioutil.TempDir("", "")
311
-
if err != nil {
312
-
t.Fatalf("TempDir: %v", err)
313
-
}
314
-
defer os.RemoveAll(dir)
293
+
dir := t.TempDir()
315
294
316
295
if err := createSymlinkRepo(dir); err != nil {
317
296
t.Fatalf("createSubmoduleRepo: %v", err)
318
297
}
319
298
320
-
indexDir, err := ioutil.TempDir("", "")
321
-
if err != nil {
322
-
t.Fatal(err)
323
-
}
324
-
defer os.RemoveAll(indexDir)
299
+
indexDir := t.TempDir()
325
300
326
301
buildOpts := build.Options{
327
302
IndexDir: indexDir,
···
372
347
}
373
348
374
349
func TestAllowMissingBranch(t *testing.T) {
375
-
dir, err := ioutil.TempDir("", "")
376
-
if err != nil {
377
-
t.Fatalf("TempDir: %v", err)
378
-
}
379
-
defer os.RemoveAll(dir)
350
+
dir := t.TempDir()
351
+
380
352
if err := createSubmoduleRepo(dir); err != nil {
381
353
t.Fatalf("createSubmoduleRepo: %v", err)
382
354
}
383
355
384
-
indexDir, err := ioutil.TempDir("", "")
385
-
if err != nil {
386
-
t.Fatal(err)
387
-
}
388
-
defer os.RemoveAll(indexDir)
356
+
indexDir := t.TempDir()
389
357
390
358
buildOpts := build.Options{
391
359
IndexDir: indexDir,
···
445
413
}
446
414
447
415
func TestBranchWildcard(t *testing.T) {
448
-
dir, err := ioutil.TempDir("", "")
449
-
if err != nil {
450
-
t.Fatalf("TempDir: %v", err)
451
-
}
452
-
defer os.RemoveAll(dir)
416
+
dir := t.TempDir()
453
417
454
418
if err := createMultibranchRepo(dir); err != nil {
455
419
t.Fatalf("createMultibranchRepo: %v", err)
456
420
}
457
421
458
-
indexDir, err := ioutil.TempDir("", "")
459
-
if err != nil {
460
-
t.Fatal(err)
461
-
}
462
-
defer os.RemoveAll(indexDir)
422
+
indexDir := t.TempDir()
463
423
464
424
buildOpts := build.Options{
465
425
IndexDir: indexDir,
···
499
459
}
500
460
501
461
func TestSkipSubmodules(t *testing.T) {
502
-
dir, err := ioutil.TempDir("", "")
503
-
if err != nil {
504
-
t.Fatalf("TempDir: %v", err)
505
-
}
506
-
defer os.RemoveAll(dir)
462
+
dir := t.TempDir()
507
463
508
464
if err := createSubmoduleRepo(dir); err != nil {
509
465
t.Fatalf("createMultibranchRepo: %v", err)
510
466
}
511
467
512
-
indexDir, err := ioutil.TempDir("", "")
513
-
if err != nil {
514
-
t.Fatal(err)
515
-
}
516
-
defer os.RemoveAll(indexDir)
468
+
indexDir := t.TempDir()
517
469
518
470
buildOpts := build.Options{
519
471
IndexDir: indexDir,
···
539
491
}
540
492
541
493
func TestFullAndShortRefNames(t *testing.T) {
542
-
dir, err := ioutil.TempDir("", "git")
543
-
if err != nil {
544
-
t.Fatalf("TempDir: %v", err)
545
-
}
546
-
defer os.RemoveAll(dir)
494
+
dir := t.TempDir()
547
495
548
496
if err := createMultibranchRepo(dir); err != nil {
549
497
t.Fatalf("createMultibranchRepo: %v", err)
550
498
}
551
499
552
-
indexDir, err := ioutil.TempDir("", "index-")
553
-
if err != nil {
554
-
t.Fatal(err)
555
-
}
556
-
os.RemoveAll(indexDir)
500
+
indexDir := t.TempDir()
557
501
558
502
buildOpts := build.Options{
559
503
IndexDir: indexDir,
+3
-13
shards/watcher_test.go
+3
-13
shards/watcher_test.go
···
47
47
}
48
48
49
49
func TestDirWatcherUnloadOnce(t *testing.T) {
50
-
dir, err := ioutil.TempDir("", "")
51
-
if err != nil {
52
-
t.Fatal(err)
53
-
}
54
-
defer os.RemoveAll(dir)
50
+
dir := t.TempDir()
55
51
56
52
logger := &loggingLoader{
57
53
loads: make(chan string, 10),
···
114
110
}
115
111
116
112
func TestDirWatcherLoadEmpty(t *testing.T) {
117
-
dir, err := ioutil.TempDir("", "")
118
-
if err != nil {
119
-
t.Fatal(err)
120
-
}
113
+
dir := t.TempDir()
121
114
122
115
logger := &loggingLoader{
123
116
loads: make(chan string, 10),
···
178
171
}
179
172
180
173
func TestDirWatcherLoadLatest(t *testing.T) {
181
-
dir, err := ioutil.TempDir("", "")
182
-
if err != nil {
183
-
t.Fatal(err)
184
-
}
174
+
dir := t.TempDir()
185
175
186
176
logger := &loggingLoader{
187
177
loads: make(chan string, 10),