mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2026-05-06 04:46:13 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18396 from roidelapluie/roidelapluie/fix-query-log-test-flakiness

Browse Source 
cmd/prometheus: fix flaky TestQueryLog console test
This commit is contained in:
Julius Volz 2026-03-31 07:25:13 +01:00 committed by GitHub
commit 74bfffc471
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/prometheus/query_log_test.go
View File

@ -68,16 +68,16 @@ func (p *queryLogTest) skip(t *testing.T) {
}
// waitForPrometheus waits for Prometheus to be ready.
func (p *queryLogTest) waitForPrometheus() error {
var err error
for range 20 {
var r *http.Response
if r, err = http.Get(fmt.Sprintf("http://%s:%d%s/-/ready", p.host, p.port, p.prefix)); err == nil && r.StatusCode == http.StatusOK {
break
func (p *queryLogTest) waitForPrometheus(t *testing.T) {
t.Helper()
require.Eventually(t, func() bool {
r, err := http.Get(fmt.Sprintf("http://%s:%d%s/-/ready", p.host, p.port, p.prefix))
if err != nil {
return false
}
time.Sleep(500 * time.Millisecond)
}
return err
r.Body.Close()
return r.StatusCode == http.StatusOK
}, 20*time.Second, 500*time.Millisecond, "prometheus at %s:%d did not become ready in time", p.host, p.port)
}
// setQueryLog alters the configuration file to enable or disable the query log,
@ -250,7 +250,7 @@ func (p *queryLogTest) params() []string {
s = append(s, "--web.route-prefix="+p.prefix)
}
if p.origin == consoleOrigin {
s = append(s, "--web.console.templates="+filepath.Join("testdata", "consoles"))
s = append(s, "--web.console.templates="+filepath.Join(p.cwd, "testdata", "consoles"))
}
return s
}
@ -323,7 +323,7 @@ func (p *queryLogTest) run(t *testing.T) {
prom.Process.Kill()
prom.Wait()
}()
require.NoError(t, p.waitForPrometheus())
p.waitForPrometheus(t)
if !p.enabledAtStart {
p.query(t)