From a78235252f2fa2ee4b4d33ed21918424614cc14f Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Tue, 25 Feb 2020 08:12:40 +0100 Subject: [PATCH] Use clean eventbus for integration tests --- pkg/eventbus/eventbus.go | 4 ++++ tests/compose/main_test.go | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/pkg/eventbus/eventbus.go b/pkg/eventbus/eventbus.go index 31cf99f4a..ae480c9ef 100644 --- a/pkg/eventbus/eventbus.go +++ b/pkg/eventbus/eventbus.go @@ -46,6 +46,10 @@ func Service() *eventbus { return gEventBus } +func Set(eb *eventbus) { + gEventBus = eb +} + func New() *eventbus { return &eventbus{ wg: &sync.WaitGroup{}, diff --git a/tests/compose/main_test.go b/tests/compose/main_test.go index a1b6d7dc3..e5e2a0dab 100644 --- a/tests/compose/main_test.go +++ b/tests/compose/main_test.go @@ -2,6 +2,7 @@ package compose import ( "context" + "github.com/cortezaproject/corteza-server/pkg/eventbus" "os" "testing" @@ -45,6 +46,8 @@ type ( var ( testApp app.Runnable r chi.Router + + eventBus = eventbus.New() ) func init() { @@ -58,6 +61,10 @@ func db() *factory.DB { func (app *TestApp) Initialize(ctx context.Context) (err error) { service.DefaultPermissions = permissions.NewTestService(ctx, app.Log, db(), "compose_permission_rules") service.DefaultStore, err = plain.NewWithAfero(afero.NewMemMapFs(), "test") + + eventBus = eventbus.New() + eventbus.Set(eventBus) + return }