mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-13 06:47:28 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Move Fatalf call into main test goroutine

Browse source
This commit is contained in:
Fabian Reinartz 2016-11-13 18:21:42 +01:00
parent 856de30c09
commit 7ecc271411
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
retrieval/scrape_test.go
View file

@ -506,7 +506,7 @@ func TestTargetScrapeScrapeCancel(t *testing.T) {
} }
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
done := make(chan struct{}) errc := make(chan error)
go func() { go func() {
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
@ -515,15 +515,18 @@ func TestTargetScrapeScrapeCancel(t *testing.T) {
go func() { go func() {
if _, err := ts.scrape(ctx, time.Now()); err != context.Canceled { if _, err := ts.scrape(ctx, time.Now()); err != context.Canceled {
t.Fatalf("Expected context cancelation error but got: %s", err) errc <- fmt.Errorf("Expected context cancelation error but got: %s", err)
} }
close(done) close(errc)
}() }()
select { select {
case <-time.After(5 * time.Second): case <-time.After(5 * time.Second):
t.Fatalf("Scrape function did not return unexpectedly") t.Fatalf("Scrape function did not return unexpectedly")
case <-done: case err := <-errc:
if err != nil {
t.Fatalf(err.Error())
}
} }
// If this is closed in a defer above the function the test server // If this is closed in a defer above the function the test server
// does not terminate and the test doens't complete. // does not terminate and the test doens't complete.