From 23de094a8180770375cb9d5fa53394b7e537de75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 8 Sep 2016 13:22:30 +0200
Subject: [PATCH] feat(alerting/annotations): fixed broken test

---
 pkg/metrics/graphite_test.go |  3 ++-
 pkg/setting/setting.go       | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg/metrics/graphite_test.go b/pkg/metrics/graphite_test.go
index 2f866ddd7b6..ff2bf530d5e 100644
--- a/pkg/metrics/graphite_test.go
+++ b/pkg/metrics/graphite_test.go
@@ -10,6 +10,8 @@ import (
 
 func TestGraphitePublisher(t *testing.T) {
 
+	setting.CustomInitPath = "conf/does_not_exist.ini"
+
 	Convey("Test graphite prefix replacement", t, func() {
 		var err error
 		err = setting.NewConfigContext(&setting.CommandLineArgs{
@@ -67,7 +69,6 @@ func TestGraphitePublisher(t *testing.T) {
 
 		_, err = setting.Cfg.NewSection("metrics.graphite")
 
-		setting.InstanceName = "hostname.with.dots.com"
 		publisher, err := CreateGraphitePublisher()
 
 		So(err, ShouldBeNil)
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index fd010c42ca2..33b026713a1 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -47,10 +47,11 @@ var (
 	BuildStamp   int64
 
 	// Paths
-	LogsPath    string
-	HomePath    string
-	DataPath    string
-	PluginsPath string
+	LogsPath       string
+	HomePath       string
+	DataPath       string
+	PluginsPath    string
+	CustomInitPath = "conf/custom.ini"
 
 	// Log settings.
 	LogModes   []string
@@ -312,7 +313,7 @@ func evalConfigValues() {
 
 func loadSpecifedConfigFile(configFile string) error {
 	if configFile == "" {
-		configFile = filepath.Join(HomePath, "conf/custom.ini")
+		configFile = filepath.Join(HomePath, CustomInitPath)
 		// return without error if custom file does not exist
 		if !pathExists(configFile) {
 			return nil