Skip to content

Commit 4a5aa66

Browse files
committed
test: use t.Fatalf for unexpected errors
1 parent 957b375 commit 4a5aa66

File tree

4 files changed

+15
-18
lines changed

4 files changed

+15
-18
lines changed

pkg/database/api-check_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func TestAPIDB_Check_NoPackages(t *testing.T) {
104104
vulns, err := db.Check([]internal.PackageDetails{})
105105

106106
if err != nil {
107-
t.Errorf("unexpected error \"%v\"", err)
107+
t.Fatalf("unexpected error \"%v\"", err)
108108
}
109109

110110
if len(vulns) > 0 {
@@ -297,7 +297,7 @@ func TestAPIDB_Check_FetchSuccessful(t *testing.T) {
297297
})
298298

299299
if err != nil {
300-
t.Errorf("unexpected error \"%v\"", err)
300+
t.Fatalf("unexpected error \"%v\"", err)
301301
}
302302

303303
if len(vulns) != 1 {
@@ -353,7 +353,7 @@ func TestAPIDB_Check_FetchFails(t *testing.T) {
353353
})
354354

355355
if err != nil {
356-
t.Errorf("unexpected error \"%v\"", err)
356+
t.Fatalf("unexpected error \"%v\"", err)
357357
}
358358

359359
if len(vulns) != 1 {
@@ -410,7 +410,7 @@ func TestAPIDB_Check_FetchMixed(t *testing.T) {
410410
})
411411

412412
if err != nil {
413-
t.Errorf("unexpected error \"%v\"", err)
413+
t.Fatalf("unexpected error \"%v\"", err)
414414
}
415415

416416
if len(vulns) != 1 {
@@ -452,7 +452,7 @@ func TestAPIDB_Check_WithCommit(t *testing.T) {
452452
})
453453

454454
if err != nil {
455-
t.Errorf("unexpected error \"%v\"", err)
455+
t.Fatalf("unexpected error \"%v\"", err)
456456
}
457457

458458
if len(vulns) != 1 {
@@ -524,7 +524,7 @@ func TestAPIDB_Check_Batches(t *testing.T) {
524524
})
525525

526526
if err != nil {
527-
t.Errorf("unexpected error \"%v\"", err)
527+
t.Fatalf("unexpected error \"%v\"", err)
528528
}
529529

530530
if requestCount != 2 {

pkg/database/api_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,11 @@ func TestNewAPIDB_Valid(t *testing.T) {
7474
)
7575

7676
if err != nil {
77-
t.Errorf("NewAPIDB() unexpected error \"%v\"", err)
77+
t.Fatalf("NewAPIDB() unexpected error \"%v\"", err)
7878
}
7979

8080
if db == nil {
8181
t.Fatalf("NewAPIDB() db unexpectedly nil")
82-
83-
// this is required currently to make the staticcheck linter
84-
return
8582
}
8683

8784
if !reflect.DeepEqual(db.BaseURL, u) {

pkg/database/dir_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestNewDirDB(t *testing.T) {
2525
db, err := database.NewDirDB(database.Config{URL: "file:/testdata/db"}, false)
2626

2727
if err != nil {
28-
t.Errorf("unexpected error \"%v\"", err)
28+
t.Fatalf("unexpected error \"%v\"", err)
2929
}
3030

3131
expectDBToHaveOSVs(t, db, osvs)
@@ -85,7 +85,7 @@ func TestNewDirDB_WorkingDirectory(t *testing.T) {
8585
db, err := database.NewDirDB(database.Config{URL: "file:/testdata/db", WorkingDirectory: "nested-1"}, false)
8686

8787
if err != nil {
88-
t.Errorf("unexpected error \"%v\"", err)
88+
t.Fatalf("unexpected error \"%v\"", err)
8989
}
9090

9191
expectDBToHaveOSVs(t, db, osvs)

pkg/database/zip_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func cacheWrite(t *testing.T, cache database.Cache) {
7575
}
7676

7777
if err != nil {
78-
t.Errorf("unexpected error with cache: %v", err)
78+
t.Fatalf("unexpected error with cache: %v", err)
7979
}
8080
}
8181

@@ -86,7 +86,7 @@ func cacheWriteBad(t *testing.T, url string, contents string) {
8686
err := os.WriteFile(cachePath(url), []byte(contents), 0644)
8787

8888
if err != nil {
89-
t.Errorf("unexpected error with cache: %v", err)
89+
t.Fatalf("unexpected error with cache: %v", err)
9090
}
9191
}
9292

@@ -179,7 +179,7 @@ func TestNewZippedDB_Offline_WithCache(t *testing.T) {
179179
db, err := database.NewZippedDB(database.Config{URL: ts.URL}, true)
180180

181181
if err != nil {
182-
t.Errorf("unexpected error \"%v\"", err)
182+
t.Fatalf("unexpected error \"%v\"", err)
183183
}
184184

185185
if db.UpdatedAt != date {
@@ -237,7 +237,7 @@ func TestNewZippedDB_Online_WithoutCache(t *testing.T) {
237237
db, err := database.NewZippedDB(database.Config{URL: ts.URL}, false)
238238

239239
if err != nil {
240-
t.Errorf("unexpected error \"%v\"", err)
240+
t.Fatalf("unexpected error \"%v\"", err)
241241
}
242242

243243
expectDBToHaveOSVs(t, db, osvs)
@@ -399,7 +399,7 @@ func TestNewZippedDB_FileChecks(t *testing.T) {
399399
db, err := database.NewZippedDB(database.Config{URL: ts.URL}, false)
400400

401401
if err != nil {
402-
t.Errorf("unexpected error \"%v\"", err)
402+
t.Fatalf("unexpected error \"%v\"", err)
403403
}
404404

405405
expectDBToHaveOSVs(t, db, osvs)
@@ -421,7 +421,7 @@ func TestNewZippedDB_WorkingDirectory(t *testing.T) {
421421
db, err := database.NewZippedDB(database.Config{URL: ts.URL, WorkingDirectory: "reviewed"}, false)
422422

423423
if err != nil {
424-
t.Errorf("unexpected error \"%v\"", err)
424+
t.Fatalf("unexpected error \"%v\"", err)
425425
}
426426

427427
expectDBToHaveOSVs(t, db, osvs)

0 commit comments

Comments
 (0)