@@ -116,18 +116,19 @@ func TestBackupRestore1(t *testing.T) {
116116
117117func TestBackupRestore2 (t * testing.T ) {
118118 tmpdir , err := ioutil .TempDir ("" , "badger-test" )
119- require .NoError (t , err )
120-
119+ if err != nil {
120+ t .Fatal (err )
121+ }
121122 defer removeDir (tmpdir )
122123
123124 s1Path := filepath .Join (tmpdir , "test1" )
124125 s2Path := filepath .Join (tmpdir , "test2" )
125126 s3Path := filepath .Join (tmpdir , "test3" )
126127
127128 db1 , err := Open (getTestOptions (s1Path ))
128- require . NoError ( t , err )
129-
130- defer db1 . Close ()
129+ if err != nil {
130+ t . Fatal ( err )
131+ }
131132 key1 := []byte ("key1" )
132133 key2 := []byte ("key2" )
133134 rawValue := []byte ("NotLongValue" )
@@ -138,30 +139,35 @@ func TestBackupRestore2(t *testing.T) {
138139 }
139140 return tx .SetEntry (NewEntry (key2 , rawValue ))
140141 })
141- require .NoError (t , err )
142-
142+ if err != nil {
143+ t .Fatal (err )
144+ }
143145 for i := byte (1 ); i < N ; i ++ {
144146 err = db1 .Update (func (tx * Txn ) error {
145147 if err := tx .SetEntry (NewEntry (append (key1 , i ), rawValue )); err != nil {
146148 return err
147149 }
148150 return tx .SetEntry (NewEntry (append (key2 , i ), rawValue ))
149151 })
150- require .NoError (t , err )
151-
152+ if err != nil {
153+ t .Fatal (err )
154+ }
152155 }
153156 var backup bytes.Buffer
154157 _ , err = db1 .Backup (& backup , 0 )
155- require .NoError (t , err )
156-
158+ if err != nil {
159+ t .Fatal (err )
160+ }
157161 fmt .Println ("backup1 length:" , backup .Len ())
158162
159163 db2 , err := Open (getTestOptions (s2Path ))
160- require . NoError ( t , err )
161-
162- defer db2 . Close ()
164+ if err != nil {
165+ t . Fatal ( err )
166+ }
163167 err = db2 .Load (& backup , 16 )
164- require .NoError (t , err )
168+ if err != nil {
169+ t .Fatal (err )
170+ }
165171
166172 for i := byte (1 ); i < N ; i ++ {
167173 err = db2 .View (func (tx * Txn ) error {
@@ -182,8 +188,9 @@ func TestBackupRestore2(t *testing.T) {
182188 }
183189 return nil
184190 })
185- require .NoError (t , err )
186-
191+ if err != nil {
192+ t .Fatal (err )
193+ }
187194 }
188195
189196 for i := byte (1 ); i < N ; i ++ {
@@ -193,22 +200,26 @@ func TestBackupRestore2(t *testing.T) {
193200 }
194201 return tx .SetEntry (NewEntry (append (key2 , i ), rawValue ))
195202 })
196- require .NoError (t , err )
197-
203+ if err != nil {
204+ t .Fatal (err )
205+ }
198206 }
199207
200208 backup .Reset ()
201209 _ , err = db2 .Backup (& backup , 0 )
202- require .NoError (t , err )
203-
210+ if err != nil {
211+ t .Fatal (err )
212+ }
204213 fmt .Println ("backup2 length:" , backup .Len ())
205214 db3 , err := Open (getTestOptions (s3Path ))
206- require . NoError ( t , err )
207-
208- defer db3 . Close ()
215+ if err != nil {
216+ t . Fatal ( err )
217+ }
209218
210219 err = db3 .Load (& backup , 16 )
211- require .NoError (t , err )
220+ if err != nil {
221+ t .Fatal (err )
222+ }
212223
213224 for i := byte (1 ); i < N ; i ++ {
214225 err = db3 .View (func (tx * Txn ) error {
@@ -229,8 +240,9 @@ func TestBackupRestore2(t *testing.T) {
229240 }
230241 return nil
231242 })
232- require .NoError (t , err )
233-
243+ if err != nil {
244+ t .Fatal (err )
245+ }
234246 }
235247
236248}
@@ -298,8 +310,9 @@ func TestBackup(t *testing.T) {
298310 }
299311 t .Run ("disk mode" , func (t * testing.T ) {
300312 tmpdir , err := ioutil .TempDir ("" , "badger-test" )
301- require .NoError (t , err )
302-
313+ if err != nil {
314+ t .Fatal (err )
315+ }
303316 defer removeDir (tmpdir )
304317 opt := DefaultOptions (filepath .Join (tmpdir , "backup0" ))
305318 runBadgerTest (t , & opt , func (t * testing.T , db * DB ) {
@@ -317,9 +330,11 @@ func TestBackup(t *testing.T) {
317330
318331func TestBackupRestore3 (t * testing.T ) {
319332 var bb bytes.Buffer
320- tmpdir , err := ioutil .TempDir ("" , "badger-test" )
321- require .NoError (t , err )
322333
334+ tmpdir , err := ioutil .TempDir ("" , "badger-test" )
335+ if err != nil {
336+ t .Fatal (err )
337+ }
323338 defer removeDir (tmpdir )
324339
325340 N := 1000
@@ -328,9 +343,10 @@ func TestBackupRestore3(t *testing.T) {
328343 // backup
329344 {
330345 db1 , err := Open (DefaultOptions (filepath .Join (tmpdir , "backup1" )))
331- require .NoError (t , err )
346+ if err != nil {
347+ t .Fatal (err )
348+ }
332349
333- defer db1 .Close ()
334350 require .NoError (t , populateEntries (db1 , entries ))
335351
336352 _ , err = db1 .Backup (& bb , 0 )
@@ -342,9 +358,9 @@ func TestBackupRestore3(t *testing.T) {
342358
343359 // restore
344360 db2 , err := Open (DefaultOptions (filepath .Join (tmpdir , "restore1" )))
345- require . NoError ( t , err )
346-
347- defer db2 . Close ()
361+ if err != nil {
362+ t . Fatal ( err )
363+ }
348364 require .NoError (t , db2 .Load (& bb , 16 ))
349365
350366 // verify
@@ -374,8 +390,9 @@ func TestBackupRestore3(t *testing.T) {
374390
375391func TestBackupLoadIncremental (t * testing.T ) {
376392 tmpdir , err := ioutil .TempDir ("" , "badger-test" )
377- require .NoError (t , err )
378-
393+ if err != nil {
394+ t .Fatal (err )
395+ }
379396 defer removeDir (tmpdir )
380397
381398 N := 100
@@ -386,9 +403,9 @@ func TestBackupLoadIncremental(t *testing.T) {
386403 // backup
387404 {
388405 db1 , err := Open (DefaultOptions (filepath .Join (tmpdir , "backup2" )))
389- require . NoError ( t , err )
390-
391- defer db1 . Close ()
406+ if err != nil {
407+ t . Fatal ( err )
408+ }
392409
393410 require .NoError (t , populateEntries (db1 , entries ))
394411 since , err := db1 .Backup (& bb , 0 )
@@ -446,10 +463,9 @@ func TestBackupLoadIncremental(t *testing.T) {
446463
447464 // restore
448465 db2 , err := Open (getTestOptions (filepath .Join (tmpdir , "restore2" )))
449- require .NoError (t , err )
450-
451- defer db2 .Close ()
452-
466+ if err != nil {
467+ t .Fatal (err )
468+ }
453469 require .NoError (t , db2 .Load (& bb , 16 ))
454470
455471 // verify
0 commit comments