@@ -15,6 +15,7 @@ import (
15
15
"github.com/cockroachdb/pebble/objstorage/objstorageprovider"
16
16
"github.com/cockroachdb/pebble/sstable/block"
17
17
"github.com/cockroachdb/pebble/vfs"
18
+ "github.com/cockroachdb/pebble/vfs/errorfs"
18
19
"github.com/stretchr/testify/require"
19
20
)
20
21
@@ -34,25 +35,23 @@ func TestIteratorErrorOnInit(t *testing.T) {
34
35
require .NoError (t , w .Set ([]byte ("test" ), nil ))
35
36
require .NoError (t , w .Close ())
36
37
37
- f1 := testutils .CheckErr (mem .Open ("test.sst" ))
38
+ toggle := errorfs.Toggle {Injector : errorfs .ErrInjected }
39
+ f1 := errorfs .WrapFile (testutils .CheckErr (mem .Open ("test.sst" )), & toggle )
40
+
38
41
r , err := newReader (f1 , ReaderOptions {
39
42
Comparer : base .DefaultComparer ,
40
43
Merger : base .DefaultMerger ,
41
44
})
42
45
require .NoError (t , err )
43
46
defer r .Close ()
44
47
45
- // Swap the readable in the reader.
46
- bad := testutils .CheckErr (mem .Create ("bad.sst" , vfs .WriteCategoryUnspecified ))
47
- require .NoError (t , bad .Close ())
48
- bad = testutils .CheckErr (mem .Open ("bad.sst" ))
49
- saveReadable := r .readable
50
- r .readable = testutils .CheckErr (NewSimpleReadable (bad ))
51
-
52
48
var pool block.BufferPool
53
49
pool .Init (5 )
54
50
defer pool .Release ()
55
51
52
+ toggle .On ()
53
+ defer toggle .Off ()
54
+
56
55
var stats base.InternalIteratorStats
57
56
for k := 0 ; k < 20 ; k ++ {
58
57
if rand .IntN (2 ) == 0 {
@@ -85,6 +84,4 @@ func TestIteratorErrorOnInit(t *testing.T) {
85
84
require .Error (t , err )
86
85
}
87
86
}
88
- require .NoError (t , r .readable .Close ())
89
- r .readable = saveReadable
90
87
}
0 commit comments