fork of https://github.com/sourcegraph/zoekt
all: fix errcheck lints in test files
author
Keegan Carruthers-Smith
date
(Dec 15, 2021, 9:23 PM +0200)
commit
88565fe4
88565fe4a7a90297f912f2e7241a89b462b8dceb
parent
c9fea678
c9fea67824287aa3488e5a0e00eb84a1ef4cbc19
+42
-16
+13
-5
build/e2e_test.go
+13
-5
build/e2e_test.go
···
268
268
if b, err := NewBuilder(opts); err != nil {
269
269
t.Fatalf("NewBuilder: %v", err)
270
270
} else {
271
-
b.AddFile("F", []byte("hoi"))
271
+
if err := b.AddFile("F", []byte("hoi")); err != nil {
272
+
t.Errorf("AddFile: %v", err)
273
+
}
272
274
if err := b.Finish(); err != nil {
273
275
t.Errorf("Finish: %v", err)
274
276
}
···
301
303
if b, err := NewBuilder(opts); err != nil {
302
304
t.Fatalf("NewBuilder: %v", err)
303
305
} else {
304
-
b.AddFile("F", []byte("hoi"))
306
+
if err := b.AddFile("F", []byte("hoi")); err != nil {
307
+
t.Errorf("AddFile: %v", err)
308
+
}
305
309
if err := b.Finish(); err != nil {
306
310
t.Errorf("Finish: %v", err)
307
311
}
···
364
368
}
365
369
for i := 0; i < 4; i++ {
366
370
s := fmt.Sprintf("%d\n", i)
367
-
b.AddFile("F"+s, []byte(strings.Repeat(s, 1024/2)))
371
+
if err := b.AddFile("F"+s, []byte(strings.Repeat(s, 1024/2))); err != nil {
372
+
t.Errorf("AddFile: %v", err)
373
+
}
368
374
}
369
375
if err := b.Finish(); err != nil {
370
376
t.Errorf("Finish: %v", err)
···
393
399
}
394
400
for i := 0; i < 4; i++ {
395
401
s := fmt.Sprintf("%d\n", i)
396
-
b.AddFile("F"+s, []byte(strings.Repeat(s, 1024/2)))
402
+
if err := b.AddFile("F"+s, []byte(strings.Repeat(s, 1024/2))); err != nil {
403
+
t.Fatal(err)
404
+
}
397
405
}
398
406
if err := b.Finish(); err != nil {
399
407
t.Errorf("Finish: %v", err)
···
448
456
nm := fmt.Sprintf("F%d", i)
449
457
450
458
// no error checking: the 2nd call will fail
451
-
b.AddFile(nm, []byte(strings.Repeat("01234567\n", 128)))
459
+
_ = b.AddFile(nm, []byte(strings.Repeat("01234567\n", 128)))
452
460
if i == 1 {
453
461
// force writes to fail.
454
462
if err := os.Chmod(dir, 0o555); err != nil {
+3
-1
cmd/zoekt-sourcegraph-indexserver/cleanup_test.go
+3
-1
cmd/zoekt-sourcegraph-indexserver/cleanup_test.go
···
315
315
if err != nil {
316
316
t.Fatalf("NewBuilder: %v", err)
317
317
}
318
-
b.AddFile("F", []byte(strings.Repeat("abc", 100)))
318
+
if err := b.AddFile("F", []byte(strings.Repeat("abc", 100))); err != nil {
319
+
t.Errorf("AddFile: %v", err)
320
+
}
319
321
if err := b.Finish(); err != nil {
320
322
t.Errorf("Finish: %v", err)
321
323
}
+3
-1
cmd/zoekt-sourcegraph-indexserver/merge_test.go
+3
-1
cmd/zoekt-sourcegraph-indexserver/merge_test.go
···
122
122
if err != nil {
123
123
t.Fatalf("NewBuilder: %v", err)
124
124
}
125
-
b.AddFile("F", []byte(strings.Repeat("abc", 100)))
125
+
if err := b.AddFile("F", []byte(strings.Repeat("abc", 100))); err != nil {
126
+
t.Fatalf("AddFile: %v", err)
127
+
}
126
128
if err := b.Finish(); err != nil {
127
129
t.Errorf("Finish: %v", err)
128
130
}
+3
-1
cmd/zoekt-sourcegraph-indexserver/meta_test.go
+3
-1
cmd/zoekt-sourcegraph-indexserver/meta_test.go
···
31
31
if err != nil {
32
32
t.Fatalf("NewBuilder: %v", err)
33
33
}
34
-
b.AddFile("F", []byte(strings.Repeat("abc", 100)))
34
+
if err := b.AddFile("F", []byte(strings.Repeat("abc", 100))); err != nil {
35
+
t.Fatalf("AddFile: %v", err)
36
+
}
35
37
if err := b.Finish(); err != nil {
36
38
t.Errorf("Finish: %v", err)
37
39
}
+3
-1
read_test.go
+3
-1
read_test.go
+3
-1
shards/sched_test.go
+3
-1
shards/sched_test.go
+8
-4
shards/shards_test.go
+8
-4
shards/shards_test.go
···
525
525
func testSearcherForRepo(b testing.TB, r *zoekt.Repository, numFiles int) zoekt.Searcher {
526
526
builder := testIndexBuilder(b, r)
527
527
528
-
builder.Add(zoekt.Document{
528
+
if err := builder.Add(zoekt.Document{
529
529
Name: fmt.Sprintf("%s/filename-%d.go", r.Name, 0),
530
530
Content: []byte("needle needle needle haystack"),
531
-
})
531
+
}); err != nil {
532
+
b.Fatal(err)
533
+
}
532
534
533
535
for i := 1; i < numFiles; i++ {
534
-
builder.Add(zoekt.Document{
536
+
if err := builder.Add(zoekt.Document{
535
537
Name: fmt.Sprintf("%s/filename-%d.go", r.Name, i),
536
538
Content: []byte("haystack haystack haystack"),
537
-
})
539
+
}); err != nil {
540
+
b.Fatal(err)
541
+
}
538
542
}
539
543
540
544
return searcherForTest(b, builder)
+6
-2
tombstones_test.go
+6
-2
tombstones_test.go
···
21
21
dir := t.TempDir()
22
22
ghostShard := filepath.Join(dir, "test.zoekt")
23
23
24
-
SetTombstone(ghostShard, 2)
24
+
if err := SetTombstone(ghostShard, 2); err != nil {
25
+
t.Fatal(err)
26
+
}
25
27
26
28
blob := readMeta(ghostShard)
27
29
gotRepos := []*Repository{}
···
39
41
t.Fatal("r3 should have been alive")
40
42
}
41
43
42
-
SetTombstone(ghostShard, 1)
44
+
if err := SetTombstone(ghostShard, 1); err != nil {
45
+
t.Fatal(err)
46
+
}
43
47
44
48
blob = readMeta(ghostShard)
45
49
gotRepos = nil