summaryrefslogtreecommitdiffstats
path: root/migrations
diff options
context:
space:
mode:
authorMartin Kraft <martinkraft@gmail.com>2018-05-24 09:29:35 -0400
committerMartin Kraft <martinkraft@gmail.com>2018-05-24 09:29:35 -0400
commit5f654079c05f7158aeeaecac8d663d5937d84f78 (patch)
treed9316c0ab8ab715b92abb85e3d0e6b0b3f5a95f6 /migrations
parentac0d656f8289fd48b776207192983e0486cbc6dd (diff)
downloadchat-5f654079c05f7158aeeaecac8d663d5937d84f78.tar.gz
chat-5f654079c05f7158aeeaecac8d663d5937d84f78.tar.bz2
chat-5f654079c05f7158aeeaecac8d663d5937d84f78.zip
Merge fixes.
Diffstat (limited to 'migrations')
-rw-r--r--migrations/migrationstestlib.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/migrations/migrationstestlib.go b/migrations/migrationstestlib.go
index b52f7af79..1b9110425 100644
--- a/migrations/migrationstestlib.go
+++ b/migrations/migrationstestlib.go
@@ -322,6 +322,8 @@ func (s *mockPluginSupervisor) Hooks() plugin.Hooks {
return s.hooks
}
+func (s *mockPluginSupervisor) Wait() error { return nil }
+
func (me *TestHelper) InstallPlugin(manifest *model.Manifest, hooks plugin.Hooks) {
if me.tempWorkspace == "" {
dir, err := ioutil.TempDir("", "apptest")
@@ -417,3 +419,6 @@ func (me *FakeClusterInterface) sendClearRoleCacheMessage() {
Event: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_ROLES,
})
}
+func (me *FakeClusterInterface) GetPluginStatuses() (model.PluginStatuses, *model.AppError) {
+ return nil, nil
+}