upstream/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2026-02-03 20:39:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge pull request #17986 from mdxabu/improve-test-error-handling

Browse source 
tests: improve error handling and helper attribution in main_test.go
This commit is contained in:
Bryan Boreham 2026-02-03 11:15:04 +00:00 committed by GitHub
commit e75c893305
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cmd/prometheus/main_test.go
View file

@ -395,6 +395,7 @@ func TestTimeMetrics(t *testing.T) {
} }
func getCurrentGaugeValuesFor(t *testing.T, reg prometheus.Gatherer, metricNames ...string) map[string]float64 { func getCurrentGaugeValuesFor(t *testing.T, reg prometheus.Gatherer, metricNames ...string) map[string]float64 {
t.Helper()
f, err := reg.Gather() f, err := reg.Gather()
require.NoError(t, err) require.NoError(t, err)
@ -426,7 +427,7 @@ func TestAgentSuccessfulStartup(t *testing.T) {
go func() { done <- prom.Wait() }() go func() { done <- prom.Wait() }()
select { select {
case err := <-done: case err := <-done:
t.Logf("prometheus agent should be still running: %v", err) t.Logf("prometheus agent exited early: %v", err)
actualExitStatus = prom.ProcessState.ExitCode() actualExitStatus = prom.ProcessState.ExitCode()
case <-time.After(startupTime): case <-time.After(startupTime):
prom.Process.Kill() prom.Process.Kill()
@ -571,12 +572,7 @@ func TestDocumentation(t *testing.T) {
var stdout bytes.Buffer var stdout bytes.Buffer
cmd.Stdout = &stdout cmd.Stdout = &stdout
if err := cmd.Run(); err != nil { require.NoError(t, cmd.Run(), "failed to generate CLI documentation via --write-documentation")
var exitError *exec.ExitError
if errors.As(err, &exitError) && exitError.ExitCode() != 0 {
fmt.Println("Command failed with non-zero exit code")
}
}
generatedContent := strings.ReplaceAll(stdout.String(), filepath.Base(promPath), strings.TrimSuffix(filepath.Base(promPath), ".test")) generatedContent := strings.ReplaceAll(stdout.String(), filepath.Base(promPath), strings.TrimSuffix(filepath.Base(promPath), ".test"))
@ -753,7 +749,7 @@ global:
configFile := filepath.Join(tmpDir, "prometheus.yml") configFile := filepath.Join(tmpDir, "prometheus.yml")
port := testutil.RandomUnprivilegedPort(t) port := testutil.RandomUnprivilegedPort(t)
os.WriteFile(configFile, []byte(tc.config), 0o777) require.NoError(t, os.WriteFile(configFile, []byte(tc.config), 0o777))
prom := prometheusCommandWithLogging( prom := prometheusCommandWithLogging(
t, t,
configFile, configFile,
@ -801,7 +797,7 @@ global:
newConfig := ` newConfig := `
runtime: runtime:
gogc: 99` gogc: 99`
os.WriteFile(configFile, []byte(newConfig), 0o777) require.NoError(t, os.WriteFile(configFile, []byte(newConfig), 0o777))
reloadPrometheusConfig(t, reloadURL) reloadPrometheusConfig(t, reloadURL)
ensureGOGCValue(99.0) ensureGOGCValue(99.0)
}) })
@ -834,7 +830,7 @@ scrape_configs:
static_configs: static_configs:
- targets: ['localhost:%d'] - targets: ['localhost:%d']
`, port, port) `, port, port)
os.WriteFile(configFile, []byte(config), 0o777) require.NoError(t, os.WriteFile(configFile, []byte(config), 0o777))
prom := prometheusCommandWithLogging( prom := prometheusCommandWithLogging(
t, t,
@ -995,7 +991,7 @@ func TestRemoteWrite_ReshardingWithoutDeadlock(t *testing.T) {
config := fmt.Sprintf(` config := fmt.Sprintf(`
global: global:
# Using a smaller interval may cause the scrape to time out. # Using a smaller interval may cause the scrape to time out.
scrape_interval: 1s scrape_interval: 1s
scrape_configs: scrape_configs:
- job_name: 'self' - job_name: 'self'
static_configs: static_configs: