Skip to content

Commit da91676

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 22e2555 commit da91676

File tree

3 files changed

+47
-85
lines changed

3 files changed

+47
-85
lines changed

‎backup_test.go

Lines changed: 38 additions & 60 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

128127
db1, err := Open(getTestOptions(s1Path))
129-
if err != nil {
130-
t.Fatal(err)
131-
}
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

164159
db2, err := Open(getTestOptions(s2Path))
165-
if err != nil {
166-
t.Fatal(err)
167-
}
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())
216205
db3, err := Open(getTestOptions(s3Path))
217-
if err != nil {
218-
t.Fatal(err)
219-
}
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
}
@@ -313,9 +298,8 @@ func TestBackup(t *testing.T) {
313298
}
314299
t.Run("disk mode", func(t *testing.T) {
315300
tmpdir, err := ioutil.TempDir("", "badger-test")
316-
if err != nil {
317-
t.Fatal(err)
318-
}
301+
require.NoError(t, err)
302+
319303
defer removeDir(tmpdir)
320304
opt := DefaultOptions(filepath.Join(tmpdir, "backup0"))
321305
runBadgerTest(t, &opt, func(t *testing.T, db *DB) {
@@ -334,9 +318,8 @@ func TestBackup(t *testing.T) {
334318
func TestBackupRestore3(t *testing.T) {
335319
var bb bytes.Buffer
336320
tmpdir, err := ioutil.TempDir("", "badger-test")
337-
if err != nil {
338-
t.Fatal(err)
339-
}
321+
require.NoError(t, err)
322+
340323
defer removeDir(tmpdir)
341324

342325
N := 1000
@@ -345,9 +328,8 @@ func TestBackupRestore3(t *testing.T) {
345328
// backup
346329
{
347330
db1, err := Open(DefaultOptions(filepath.Join(tmpdir, "backup1")))
348-
if err != nil {
349-
t.Fatal(err)
350-
}
331+
require.NoError(t, err)
332+
351333
defer db1.Close()
352334
require.NoError(t, populateEntries(db1, entries))
353335

@@ -360,9 +342,8 @@ func TestBackupRestore3(t *testing.T) {
360342

361343
// restore
362344
db2, err := Open(DefaultOptions(filepath.Join(tmpdir, "restore1")))
363-
if err != nil {
364-
t.Fatal(err)
365-
}
345+
require.NoError(t, err)
346+
366347
defer db2.Close()
367348
require.NoError(t, db2.Load(&bb, 16))
368349

@@ -393,9 +374,8 @@ func TestBackupRestore3(t *testing.T) {
393374

394375
func TestBackupLoadIncremental(t *testing.T) {
395376
tmpdir, err := ioutil.TempDir("", "badger-test")
396-
if err != nil {
397-
t.Fatal(err)
398-
}
377+
require.NoError(t, err)
378+
399379
defer removeDir(tmpdir)
400380

401381
N := 100
@@ -406,9 +386,8 @@ func TestBackupLoadIncremental(t *testing.T) {
406386
// backup
407387
{
408388
db1, err := Open(DefaultOptions(filepath.Join(tmpdir, "backup2")))
409-
if err != nil {
410-
t.Fatal(err)
411-
}
389+
require.NoError(t, err)
390+
412391
defer db1.Close()
413392

414393
require.NoError(t, populateEntries(db1, entries))
@@ -467,9 +446,8 @@ func TestBackupLoadIncremental(t *testing.T) {
467446

468447
// restore
469448
db2, err := Open(getTestOptions(filepath.Join(tmpdir, "restore2")))
470-
if err != nil {
471-
t.Fatal(err)
472-
}
449+
require.NoError(t, err)
450+
473451
defer db2.Close()
474452

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

‎db_test.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,9 +1567,6 @@ func TestLSMOnly(t *testing.T) {
15671567
opts.ValueLogMaxEntries = 100
15681568
db, err := Open(opts)
15691569
require.NoError(t, err)
1570-
if err != nil {
1571-
t.Fatal(err)
1572-
}
15731570

15741571
value := make([]byte, 128)
15751572
_, err = rand.Read(value)
@@ -1581,9 +1578,7 @@ func TestLSMOnly(t *testing.T) {
15811578

15821579
db, err = Open(opts)
15831580
require.NoError(t, err)
1584-
if err != nil {
1585-
t.Fatal(err)
1586-
}
1581+
15871582
defer db.Close()
15881583
require.NoError(t, db.RunValueLogGC(0.2))
15891584
}

‎txn_test.go

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

838838
func TestArmV7Issue311Fix(t *testing.T) {
839839
dir, err := ioutil.TempDir("", "")
840-
if err != nil {
841-
t.Fatal(err)
842-
}
840+
require.NoError(t, err)
841+
843842
defer removeDir(dir)
844843

845844
db, err := Open(DefaultOptions(dir).
@@ -848,31 +847,21 @@ func TestArmV7Issue311Fix(t *testing.T) {
848847
WithLevelOneSize(8 << 20).
849848
WithMaxTableSize(2 << 20).
850849
WithSyncWrites(false))
851-
if err != nil {
852-
t.Fatalf("cannot open db at location %s: %v", dir, err)
853-
}
850+
851+
require.NoError(t, err)
854852

855853
err = db.View(func(txn *Txn) error { return nil })
856-
if err != nil {
857-
t.Fatal(err)
858-
}
854+
require.NoError(t, err)
859855

860856
err = db.Update(func(txn *Txn) error {
861857
return txn.SetEntry(NewEntry([]byte{0x11}, []byte{0x22}))
862858
})
863-
if err != nil {
864-
t.Fatal(err)
865-
}
859+
require.NoError(t, err)
866860

867861
err = db.Update(func(txn *Txn) error {
868862
return txn.SetEntry(NewEntry([]byte{0x11}, []byte{0x22}))
869863
})
870864

871-
if err != nil {
872-
t.Fatal(err)
873-
}
874-
875-
if err = db.Close(); err != nil {
876-
t.Fatal(err)
877-
}
865+
require.NoError(t, err)
866+
require.NoError(t, db.Close())
878867
}

0 commit comments

Comments
 (0)