mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fixed the tests

Browse source 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
This commit is contained in:
Krasi Georgiev 2017-12-30 17:47:18 +00:00
parent d12e6f29fc
commit 767faa44b6
2 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
discovery/manager_test.go
View file

@ -24,6 +24,7 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
sd_config "github.com/prometheus/prometheus/discovery/config"
"github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/discovery/targetgroup"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )
@ -743,7 +744,11 @@ scrape_configs:
discoveryManager := NewManager(nil) discoveryManager := NewManager(nil)
go discoveryManager.Run(ctx) go discoveryManager.Run(ctx)
discoveryManager.ApplyConfig(cfg) c := make(map[string]sd_config.ServiceDiscoveryConfig)
for _, v := range cfg.ScrapeConfigs {
c[v.JobName] = v.ServiceDiscoveryConfig
}
discoveryManager.ApplyConfig(c)
_ = <-discoveryManager.SyncCh() _ = <-discoveryManager.SyncCh()
verifyPresence(discoveryManager.targets, poolKey{setName: "prometheus", provider: "static/0"}, "{__address__=\"foo:9090\"}", true) verifyPresence(discoveryManager.targets, poolKey{setName: "prometheus", provider: "static/0"}, "{__address__=\"foo:9090\"}", true)
@ -758,7 +763,11 @@ scrape_configs:
if err := yaml.Unmarshal([]byte(sTwo), cfg); err != nil { if err := yaml.Unmarshal([]byte(sTwo), cfg); err != nil {
t.Fatalf("Unable to load YAML config sOne: %s", err) t.Fatalf("Unable to load YAML config sOne: %s", err)
} }
discoveryManager.ApplyConfig(cfg) c = make(map[string]sd_config.ServiceDiscoveryConfig)
for _, v := range cfg.ScrapeConfigs {
c[v.JobName] = v.ServiceDiscoveryConfig
}
discoveryManager.ApplyConfig(c)
_ = <-discoveryManager.SyncCh() _ = <-discoveryManager.SyncCh()
verifyPresence(discoveryManager.targets, poolKey{setName: "prometheus", provider: "static/0"}, "{__address__=\"foo:9090\"}", true) verifyPresence(discoveryManager.targets, poolKey{setName: "prometheus", provider: "static/0"}, "{__address__=\"foo:9090\"}", true)

21
notifier/notifier_test.go
View file

@ -173,7 +173,10 @@ func TestHandlerSendAll(t *testing.T) {
Password: "testing_password", Password: "testing_password",
}, },
}, "auth_alertmanager") }, "auth_alertmanager")
h.alertmanagers = append(h.alertmanagers, &alertmanagerSet{
h.alertmanagers = make(map[string]*alertmanagerSet)
h.alertmanagers["1"] = &alertmanagerSet{
ams: []alertmanager{ ams: []alertmanager{
alertmanagerMock{ alertmanagerMock{
urlf: func() string { return server1.URL }, urlf: func() string { return server1.URL },
@ -183,9 +186,9 @@ func TestHandlerSendAll(t *testing.T) {
Timeout: time.Second, Timeout: time.Second,
}, },
client: authClient, client: authClient,
}) }
h.alertmanagers = append(h.alertmanagers, &alertmanagerSet{ h.alertmanagers["2"] = &alertmanagerSet{
ams: []alertmanager{ ams: []alertmanager{
alertmanagerMock{ alertmanagerMock{
urlf: func() string { return server2.URL }, urlf: func() string { return server2.URL },
@ -194,7 +197,7 @@ func TestHandlerSendAll(t *testing.T) {
cfg: &config.AlertmanagerConfig{ cfg: &config.AlertmanagerConfig{
Timeout: time.Second, Timeout: time.Second,
}, },
}) }
for i := range make([]struct{}, maxBatchSize) { for i := range make([]struct{}, maxBatchSize) {
h.queue = append(h.queue, &Alert{ h.queue = append(h.queue, &Alert{
@ -355,7 +358,10 @@ func TestHandlerQueueing(t *testing.T) {
}, },
nil, nil,
) )
h.alertmanagers = append(h.alertmanagers, &alertmanagerSet{
h.alertmanagers = make(map[string]*alertmanagerSet)
h.alertmanagers["1"] = &alertmanagerSet{
ams: []alertmanager{ ams: []alertmanager{
alertmanagerMock{ alertmanagerMock{
urlf: func() string { return server.URL }, urlf: func() string { return server.URL },
@ -364,7 +370,7 @@ func TestHandlerQueueing(t *testing.T) {
cfg: &config.AlertmanagerConfig{ cfg: &config.AlertmanagerConfig{
Timeout: time.Second, Timeout: time.Second,
}, },
}) }
var alerts []*Alert var alerts []*Alert
@ -374,7 +380,8 @@ func TestHandlerQueueing(t *testing.T) {
}) })
} }
go h.Run() c := make(chan map[string][]*targetgroup.Group)
go h.Run(c)
defer h.Stop() defer h.Stop()
h.Send(alerts[:4*maxBatchSize]...) h.Send(alerts[:4*maxBatchSize]...)