Skip to content

Commit fd8ab0c

Browse files
author
Ibrahim Jarif
committed
Replace t.Fatal with require.NoError in tests (#1213)
We are using the following pattern in tests that can be replaced with `require.NoError(t, err)`. ```go if err != nil { t.Fatal(err) } ``` (cherry picked from commit 78d405a)
1 parent 89af297 commit fd8ab0c

File tree

3 files changed

+49
-86
lines changed

3 files changed

+49
-86
lines changed

‎backup_test.go

Lines changed: 40 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -116,19 +116,17 @@ func TestBackupRestore1(t *testing.T) {
116116

117117
func TestBackupRestore2(t *testing.T) {
118118
tmpdir, err := ioutil.TempDir("", "badger-test")
119-
if err != nil {
120-
t.Fatal(err)
121-
}
119+
require.NoError(t, err)
120+
122121
defer removeDir(tmpdir)
123122

124123
s1Path := filepath.Join(tmpdir, "test1")
125124
s2Path := filepath.Join(tmpdir, "test2")
126125
s3Path := filepath.Join(tmpdir, "test3")
127126

128-
db1, err := Open(DefaultOptions(s1Path))
129-
if err != nil {
130-
t.Fatal(err)
131-
}
127+
db1, err := Open(getTestOptions(s1Path))
128+
require.NoError(t, err)
129+
132130
defer db1.Close()
133131
key1 := []byte("key1")
134132
key2 := []byte("key2")
@@ -140,36 +138,30 @@ func TestBackupRestore2(t *testing.T) {
140138
}
141139
return tx.SetEntry(NewEntry(key2, rawValue))
142140
})
143-
if err != nil {
144-
t.Fatal(err)
145-
}
141+
require.NoError(t, err)
142+
146143
for i := byte(1); i < N; i++ {
147144
err = db1.Update(func(tx *Txn) error {
148145
if err := tx.SetEntry(NewEntry(append(key1, i), rawValue)); err != nil {
149146
return err
150147
}
151148
return tx.SetEntry(NewEntry(append(key2, i), rawValue))
152149
})
153-
if err != nil {
154-
t.Fatal(err)
155-
}
150+
require.NoError(t, err)
151+
156152
}
157153
var backup bytes.Buffer
158154
_, err = db1.Backup(&backup, 0)
159-
if err != nil {
160-
t.Fatal(err)
161-
}
155+
require.NoError(t, err)
156+
162157
fmt.Println("backup1 length:", backup.Len())
163158

164-
db2, err := Open(DefaultOptions(s2Path))
165-
if err != nil {
166-
t.Fatal(err)
167-
}
159+
db2, err := Open(getTestOptions(s2Path))
160+
require.NoError(t, err)
161+
168162
defer db2.Close()
169163
err = db2.Load(&backup, 16)
170-
if err != nil {
171-
t.Fatal(err)
172-
}
164+
require.NoError(t, err)
173165

174166
for i := byte(1); i < N; i++ {
175167
err = db2.View(func(tx *Txn) error {
@@ -190,9 +182,8 @@ func TestBackupRestore2(t *testing.T) {
190182
}
191183
return nil
192184
})
193-
if err != nil {
194-
t.Fatal(err)
195-
}
185+
require.NoError(t, err)
186+
196187
}
197188

198189
for i := byte(1); i < N; i++ {
@@ -202,27 +193,22 @@ func TestBackupRestore2(t *testing.T) {
202193
}
203194
return tx.SetEntry(NewEntry(append(key2, i), rawValue))
204195
})
205-
if err != nil {
206-
t.Fatal(err)
207-
}
196+
require.NoError(t, err)
197+
208198
}
209199

210200
backup.Reset()
211201
_, err = db2.Backup(&backup, 0)
212-
if err != nil {
213-
t.Fatal(err)
214-
}
202+
require.NoError(t, err)
203+
215204
fmt.Println("backup2 length:", backup.Len())
216-
db3, err := Open(DefaultOptions(s3Path))
217-
if err != nil {
218-
t.Fatal(err)
219-
}
205+
db3, err := Open(getTestOptions(s3Path))
206+
require.NoError(t, err)
207+
220208
defer db3.Close()
221209

222210
err = db3.Load(&backup, 16)
223-
if err != nil {
224-
t.Fatal(err)
225-
}
211+
require.NoError(t, err)
226212

227213
for i := byte(1); i < N; i++ {
228214
err = db3.View(func(tx *Txn) error {
@@ -243,9 +229,8 @@ func TestBackupRestore2(t *testing.T) {
243229
}
244230
return nil
245231
})
246-
if err != nil {
247-
t.Fatal(err)
248-
}
232+
require.NoError(t, err)
233+
249234
}
250235

251236
}
@@ -326,9 +311,8 @@ func TestBackup(t *testing.T) {
326311
func TestBackupRestore3(t *testing.T) {
327312
var bb bytes.Buffer
328313
tmpdir, err := ioutil.TempDir("", "badger-test")
329-
if err != nil {
330-
t.Fatal(err)
331-
}
314+
require.NoError(t, err)
315+
332316
defer removeDir(tmpdir)
333317

334318
N := 1000
@@ -337,9 +321,8 @@ func TestBackupRestore3(t *testing.T) {
337321
// backup
338322
{
339323
db1, err := Open(DefaultOptions(filepath.Join(tmpdir, "backup1")))
340-
if err != nil {
341-
t.Fatal(err)
342-
}
324+
require.NoError(t, err)
325+
343326
defer db1.Close()
344327
require.NoError(t, populateEntries(db1, entries))
345328

@@ -352,9 +335,8 @@ func TestBackupRestore3(t *testing.T) {
352335

353336
// restore
354337
db2, err := Open(DefaultOptions(filepath.Join(tmpdir, "restore1")))
355-
if err != nil {
356-
t.Fatal(err)
357-
}
338+
require.NoError(t, err)
339+
358340
defer db2.Close()
359341
require.NoError(t, db2.Load(&bb, 16))
360342

@@ -385,9 +367,8 @@ func TestBackupRestore3(t *testing.T) {
385367

386368
func TestBackupLoadIncremental(t *testing.T) {
387369
tmpdir, err := ioutil.TempDir("", "badger-test")
388-
if err != nil {
389-
t.Fatal(err)
390-
}
370+
require.NoError(t, err)
371+
391372
defer removeDir(tmpdir)
392373

393374
N := 100
@@ -398,9 +379,8 @@ func TestBackupLoadIncremental(t *testing.T) {
398379
// backup
399380
{
400381
db1, err := Open(DefaultOptions(filepath.Join(tmpdir, "backup2")))
401-
if err != nil {
402-
t.Fatal(err)
403-
}
382+
require.NoError(t, err)
383+
404384
defer db1.Close()
405385

406386
require.NoError(t, populateEntries(db1, entries))
@@ -458,10 +438,9 @@ func TestBackupLoadIncremental(t *testing.T) {
458438
require.True(t, bb.Len() > 0)
459439

460440
// restore
461-
db2, err := Open(DefaultOptions(filepath.Join(tmpdir, "restore2")))
462-
if err != nil {
463-
t.Fatal(err)
464-
}
441+
db2, err := Open(getTestOptions(filepath.Join(tmpdir, "restore2")))
442+
require.NoError(t, err)
443+
465444
defer db2.Close()
466445

467446
require.NoError(t, db2.Load(&bb, 16))

‎db_test.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,9 +1460,6 @@ func TestLSMOnly(t *testing.T) {
14601460
opts.ValueLogMaxEntries = 100
14611461
db, err := Open(opts)
14621462
require.NoError(t, err)
1463-
if err != nil {
1464-
t.Fatal(err)
1465-
}
14661463

14671464
value := make([]byte, 128)
14681465
_, err = rand.Read(value)
@@ -1474,9 +1471,7 @@ func TestLSMOnly(t *testing.T) {
14741471

14751472
db, err = Open(opts)
14761473
require.NoError(t, err)
1477-
if err != nil {
1478-
t.Fatal(err)
1479-
}
1474+
14801475
defer db.Close()
14811476
require.NoError(t, db.RunValueLogGC(0.2))
14821477
}

‎txn_test.go

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -797,9 +797,8 @@ func TestManagedDB(t *testing.T) {
797797

798798
func TestArmV7Issue311Fix(t *testing.T) {
799799
dir, err := ioutil.TempDir("", "")
800-
if err != nil {
801-
t.Fatal(err)
802-
}
800+
require.NoError(t, err)
801+
803802
defer removeDir(dir)
804803

805804
db, err := Open(DefaultOptions(dir).
@@ -808,31 +807,21 @@ func TestArmV7Issue311Fix(t *testing.T) {
808807
WithLevelOneSize(8 << 20).
809808
WithMaxTableSize(2 << 20).
810809
WithSyncWrites(false))
811-
if err != nil {
812-
t.Fatalf("cannot open db at location %s: %v", dir, err)
813-
}
810+
811+
require.NoError(t, err)
814812

815813
err = db.View(func(txn *Txn) error { return nil })
816-
if err != nil {
817-
t.Fatal(err)
818-
}
814+
require.NoError(t, err)
819815

820816
err = db.Update(func(txn *Txn) error {
821817
return txn.SetEntry(NewEntry([]byte{0x11}, []byte{0x22}))
822818
})
823-
if err != nil {
824-
t.Fatal(err)
825-
}
819+
require.NoError(t, err)
826820

827821
err = db.Update(func(txn *Txn) error {
828822
return txn.SetEntry(NewEntry([]byte{0x11}, []byte{0x22}))
829823
})
830824

831-
if err != nil {
832-
t.Fatal(err)
833-
}
834-
835-
if err = db.Close(); err != nil {
836-
t.Fatal(err)
837-
}
825+
require.NoError(t, err)
826+
require.NoError(t, db.Close())
838827
}

0 commit comments

Comments
 (0)