github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1348 from prometheus/notifytestfix 

Increase notification test timeouts
pull/1354/head
Fabian Reinartz 2016-01-27 02:50:03 +01:00
parent d7f92a012b 41a39472a1
commit 2e29573770
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
notification/notification.go
View File

@ -274,7 +274,6 @@ func (n *Handler) send(alerts ...*model.Alert) error {
func (n *Handler) Stop() { func (n *Handler) Stop() {
log.Info("Stopping notification handler...") log.Info("Stopping notification handler...")
close(n.more)
n.cancel() n.cancel()
} }

4
notification/notification_test.go
View File

@ -192,7 +192,7 @@ func TestHandlerFull(t *testing.T) {
case <-called: case <-called:
expected = alerts[i*maxBatchSize : (i+1)*maxBatchSize] expected = alerts[i*maxBatchSize : (i+1)*maxBatchSize]
unblock <- struct{}{} unblock <- struct{}{}
case <-time.After(time.Second): case <-time.After(5 * time.Second):
t.Fatalf("Alerts were not pushed") t.Fatalf("Alerts were not pushed")
} }
} }
@ -218,7 +218,7 @@ func TestHandlerFull(t *testing.T) {
case <-called: case <-called:
expected = alerts[i*maxBatchSize : (i+1)*maxBatchSize] expected = alerts[i*maxBatchSize : (i+1)*maxBatchSize]
unblock <- struct{}{} unblock <- struct{}{}
case <-time.After(time.Second): case <-time.After(5 * time.Second):
t.Fatalf("Alerts were not pushed") t.Fatalf("Alerts were not pushed")
} }
} }