From 5f654079c05f7158aeeaecac8d663d5937d84f78 Mon Sep 17 00:00:00 2001
From: Martin Kraft <martinkraft@gmail.com>
Date: Thu, 24 May 2018 09:29:35 -0400
Subject: Merge fixes.

---
 migrations/migrationstestlib.go | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'migrations')

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
+}
-- 
cgit v1.2.3-1-g7c22