From 1d9efd0e39a9663bb2fbf52b3353fe21ac3b6954 Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Thu, 11 Jan 2018 15:23:41 -0600
Subject: Remove global config watcher (#8080)

* remove global config watcher

* keep config watcher disabled for tests

* compile fix

* fix resource leak
---
 app/apptestlib.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'app/apptestlib.go')

diff --git a/app/apptestlib.go b/app/apptestlib.go
index 912433290..1ec45f0fa 100644
--- a/app/apptestlib.go
+++ b/app/apptestlib.go
@@ -57,13 +57,18 @@ func StopTestStore() {
 }
 
 func setupTestHelper(enterprise bool) *TestHelper {
-	var options []Option
+	options := []Option{DisableConfigWatch}
 	if testStore != nil {
 		options = append(options, StoreOverride(testStore))
 	}
 
+	a, err := New(options...)
+	if err != nil {
+		panic(err)
+	}
+
 	th := &TestHelper{
-		App:         New(options...),
+		App:         a,
 		pluginHooks: make(map[string]plugin.Hooks),
 	}
 
-- 
cgit v1.2.3-1-g7c22