From 79216011cb72be07ab760ede71bf96c2bc3b4bd1 Mon Sep 17 00:00:00 2001
From: Dan Milstein <milstein.dan@gmail.com>
Date: Thu, 25 Aug 2016 14:36:26 -0400
Subject: [PATCH 1/2] Add basic test for TargetManager.targetSet

Verify that if the configs change, target groups are cleaned on
TargetManager.reload (rather than having old ones linger around, even if
they are no longer present in the configs).

This covers the bug fixed in #1907 -- I verified that by checking out
source from before that commit.

This is a start on #1906
---
 retrieval/targetmanager_test.go | 60 +++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/retrieval/targetmanager_test.go b/retrieval/targetmanager_test.go
index 074fe51ec..e9d4544c3 100644
--- a/retrieval/targetmanager_test.go
+++ b/retrieval/targetmanager_test.go
@@ -12,3 +12,63 @@
 // limitations under the License.
 
 package retrieval
+
+import (
+	"testing"
+
+	"golang.org/x/net/context"
+	"gopkg.in/yaml.v2"
+
+	"github.com/prometheus/prometheus/config"
+	"github.com/prometheus/prometheus/storage/local"
+)
+
+func TestTargetSetRecreatesTargetGroupsEveryRun(t *testing.T) {
+	scrapeConfig := &config.ScrapeConfig{}
+
+	sOne := `
+job_name: "foo"
+dns_sd_configs:
+- names:
+  - "srv.name.one.example.org"
+`
+	if err := yaml.Unmarshal([]byte(sOne), scrapeConfig); err != nil {
+		t.Fatalf("Unable to load YAML config sOne: %s", err)
+	}
+
+	// Not properly setting it up, but that seems okay
+	mss := &local.MemorySeriesStorage{}
+
+	ts := newTargetSet(scrapeConfig, mss)
+
+	ts.runProviders(context.Background(), providersFromConfig(scrapeConfig))
+
+	verifyPresence(t, ts.tgroups, "dns/0/srv.name.one.example.org", true)
+
+	sTwo := `
+job_name: "foo"
+dns_sd_configs:
+- names:
+  - "srv.name.two.example.org"
+`
+	if err := yaml.Unmarshal([]byte(sTwo), scrapeConfig); err != nil {
+		t.Fatalf("Unable to load YAML config sTwo: %s", err)
+	}
+
+	ts.runProviders(context.Background(), providersFromConfig(scrapeConfig))
+
+	verifyPresence(t, ts.tgroups, "dns/0/srv.name.one.example.org", false)
+	verifyPresence(t, ts.tgroups, "dns/0/srv.name.two.example.org", true)
+
+}
+
+func verifyPresence(t *testing.T, tgroups map[string][]*Target, name string, present bool) {
+	if _, ok := tgroups[name]; ok != present {
+		msg := ""
+		if !present {
+			msg = "not "
+		}
+		t.Fatalf("'%s' should %sbe present in TargetSet.tgroups: %s", name, msg, tgroups)
+	}
+
+}

From b9fb9742ed2b0d814360d02f5d10502708c601ca Mon Sep 17 00:00:00 2001
From: Dan Milstein <milstein.dan@gmail.com>
Date: Mon, 29 Aug 2016 16:08:40 -0400
Subject: [PATCH 2/2] Move test helper function into scope of test func

---
 retrieval/targetmanager_test.go | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/retrieval/targetmanager_test.go b/retrieval/targetmanager_test.go
index e9d4544c3..72894a503 100644
--- a/retrieval/targetmanager_test.go
+++ b/retrieval/targetmanager_test.go
@@ -24,6 +24,18 @@ import (
 )
 
 func TestTargetSetRecreatesTargetGroupsEveryRun(t *testing.T) {
+
+	verifyPresence := func(tgroups map[string][]*Target, name string, present bool) {
+		if _, ok := tgroups[name]; ok != present {
+			msg := ""
+			if !present {
+				msg = "not "
+			}
+			t.Fatalf("'%s' should %sbe present in TargetSet.tgroups: %s", name, msg, tgroups)
+		}
+
+	}
+
 	scrapeConfig := &config.ScrapeConfig{}
 
 	sOne := `
@@ -43,7 +55,7 @@ dns_sd_configs:
 
 	ts.runProviders(context.Background(), providersFromConfig(scrapeConfig))
 
-	verifyPresence(t, ts.tgroups, "dns/0/srv.name.one.example.org", true)
+	verifyPresence(ts.tgroups, "dns/0/srv.name.one.example.org", true)
 
 	sTwo := `
 job_name: "foo"
@@ -57,18 +69,6 @@ dns_sd_configs:
 
 	ts.runProviders(context.Background(), providersFromConfig(scrapeConfig))
 
-	verifyPresence(t, ts.tgroups, "dns/0/srv.name.one.example.org", false)
-	verifyPresence(t, ts.tgroups, "dns/0/srv.name.two.example.org", true)
-
-}
-
-func verifyPresence(t *testing.T, tgroups map[string][]*Target, name string, present bool) {
-	if _, ok := tgroups[name]; ok != present {
-		msg := ""
-		if !present {
-			msg = "not "
-		}
-		t.Fatalf("'%s' should %sbe present in TargetSet.tgroups: %s", name, msg, tgroups)
-	}
-
+	verifyPresence(ts.tgroups, "dns/0/srv.name.one.example.org", false)
+	verifyPresence(ts.tgroups, "dns/0/srv.name.two.example.org", true)
 }