From 34285d8cca93fc0f473636e78680fade03f26bda Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 16 Oct 2017 08:09:43 -0700 Subject: parallel tests (#7629) --- app/app.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'app/app.go') diff --git a/app/app.go b/app/app.go index 7b6499b1f..34c0721a0 100644 --- a/app/app.go +++ b/app/app.go @@ -47,7 +47,8 @@ type App struct { Mfa einterfaces.MfaInterface Saml einterfaces.SamlInterface - newStore func() store.Store + newStore func() store.Store + configOverride func(*model.Config) *model.Config } var appCount = 0 @@ -77,7 +78,7 @@ func New(options ...Option) *App { if app.newStore == nil { app.newStore = func() store.Store { - return store.NewLayeredStore(sqlstore.NewSqlSupplier(utils.Cfg.SqlSettings, app.Metrics), app.Metrics, app.Cluster) + return store.NewLayeredStore(sqlstore.NewSqlSupplier(app.Config().SqlSettings, app.Metrics), app.Metrics, app.Cluster) } } @@ -233,6 +234,9 @@ func (a *App) initEnterprise() { } func (a *App) Config() *model.Config { + if a.configOverride != nil { + return a.configOverride(utils.Cfg) + } return utils.Cfg } -- cgit v1.2.3-1-g7c22