From 6bf080393d88534aa658ecaff32ae089bd304772 Mon Sep 17 00:00:00 2001
From: Corey Hulen <corey@hulen.com>
Date: Tue, 4 Apr 2017 11:42:07 -0700
Subject: Fixing race conditions in the code base (#5966)

* Adding initial race detector

* Remove setting of config twice

* Fixing config file watch and config reload on license save

* Fixing config file watch and config reload on license save

* Fixing build error

* Fixing locking issue

* Fixing makefile

* Fixing race in config

* Fixing race in status unit test

* Adding EE race tests

* Fixing race in cluster info

* Removing code that's isn't needed

* Fixing some more races

* Fixing govet issue
---
 api/apitestlib.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'api/apitestlib.go')

diff --git a/api/apitestlib.go b/api/apitestlib.go
index f65d4e5a9..bcc7de879 100644
--- a/api/apitestlib.go
+++ b/api/apitestlib.go
@@ -86,6 +86,18 @@ func Setup() *TestHelper {
 	return &TestHelper{}
 }
 
+func ReloadConfigForSetup() {
+	utils.LoadConfig("config.json")
+	utils.InitTranslations(utils.Cfg.LocalizationSettings)
+	utils.Cfg.TeamSettings.MaxUsersPerTeam = 50
+	*utils.Cfg.RateLimitSettings.Enable = false
+	utils.Cfg.EmailSettings.SendEmailNotifications = true
+	utils.Cfg.EmailSettings.SMTPServer = "dockerhost"
+	utils.Cfg.EmailSettings.SMTPPort = "2500"
+	utils.Cfg.EmailSettings.FeedbackEmail = "test@example.com"
+	*utils.Cfg.TeamSettings.EnableOpenServer = true
+}
+
 func (me *TestHelper) InitBasic() *TestHelper {
 	me.BasicClient = me.CreateClient()
 	me.BasicUser = me.CreateUser(me.BasicClient)
-- 
cgit v1.2.3-1-g7c22