Commit e3ba71d3 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 7d81b8dc
...@@ -54,6 +54,7 @@ func TestMasterStorage(t *testing.T) { ...@@ -54,6 +54,7 @@ func TestMasterStorage(t *testing.T) {
} }
func _TestMasterStorage(t0 *tEnv) { func _TestMasterStorage(t0 *tEnv) {
X := exc.Raiseif X := exc.Raiseif
bg := context.Background()
zback := xfs1back("../zodb/storage/fs1/testdata/1.fs") zback := xfs1back("../zodb/storage/fs1/testdata/1.fs")
zstor := xfs1stor("../zodb/storage/fs1/testdata/1.fs") zstor := xfs1stor("../zodb/storage/fs1/testdata/1.fs")
......
...@@ -45,19 +45,17 @@ func gox(wg interface { Go(func(context.Context) error) }, xf func(context.Conte ...@@ -45,19 +45,17 @@ func gox(wg interface { Go(func(context.Context) error) }, xf func(context.Conte
} }
func xfs1stor(path string) *zfs1.FileStorage { func xfs1stor(path string) *zfs1.FileStorage {
stor, _, err := zfs1.Open(bg, path, &zodb.DriverOptions{ReadOnly: true}) // XXX opts = ? stor, _, err := zfs1.Open(context.Background(), path, &zodb.DriverOptions{ReadOnly: true})
exc.Raiseif(err) exc.Raiseif(err)
return stor return stor
} }
func xfs1back(path string) *bfs1.Backend { func xfs1back(path string) *bfs1.Backend {
back, err := bfs1.Open(bg, path) back, err := bfs1.Open(context.Background(), path)
exc.Raiseif(err) exc.Raiseif(err)
return back return back
} }
var bg = context.Background()
// vclock is a virtual clock // vclock is a virtual clock
type vclock struct { type vclock struct {
t float64 t float64
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment