Merge "syncbase/vsync: Bug fix. Cleanup to prevent running out of fds."
diff --git a/x/ref/services/syncbase/vsync/test_util.go b/x/ref/services/syncbase/vsync/test_util.go
index d98d35a..e454574 100644
--- a/x/ref/services/syncbase/vsync/test_util.go
+++ b/x/ref/services/syncbase/vsync/test_util.go
@@ -88,10 +88,6 @@
return "mockapp"
}
-func (a *mockApp) StKey() string {
- return ""
-}
-
// mockDatabase emulates a Syncbase Database. It is used to test sync functionality.
type mockDatabase struct {
st store.Store
@@ -118,10 +114,6 @@
return "mockdb"
}
-func (d *mockDatabase) StKey() string {
- return ""
-}
-
func (d *mockDatabase) App() interfaces.App {
return nil
}
@@ -153,6 +145,7 @@
shutdown: shutdown,
}
if s.sync, err = New(ctx, nil, s, nil); err != nil {
+ bst.Close()
util.DestroyStore(engine, dir)
t.Fatalf("cannot create sync service: %v", err)
}
@@ -163,6 +156,7 @@
func destroyService(t *testing.T, s *mockService) {
defer s.shutdown()
defer s.sync.Close()
+ s.bst.Close()
if err := util.DestroyStore(s.engine, s.dir); err != nil {
t.Fatalf("cannot destroy store %s (%s): %v", s.engine, s.dir, err)
}
