fix(obs): isolate harness repetitions
- commit
- 51273ffb49e1e15c3d510c2c0bc914203e4f8364
- author
- brice · · 2026-07-13 01:25 UTC
- parent
- f90898d
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
2 files · +3 -3
M cmd/vev-perf-harness/main.go +1 -1
| @@ -1530,7 +1530,7 @@ func mergeProcessTraces(mappings []processMapping) ([]span, error) { | |||
| 1530 | 1530 | for _, m := range mappings { | |
| 1531 | 1531 | f, err := os.Open(m.TracePath) | |
| 1532 | 1532 | if err != nil { | |
| 1533 | - | return nil, err | |
| 1533 | + | return nil, fmt.Errorf("open manifest trace for %s role: %w", m.Role, err) | |
| 1534 | 1534 | } | |
| 1535 | 1535 | var records []traceRecord | |
| 1536 | 1536 | scan := bufio.NewScanner(f) | |
| @@ -1530,7 +1530,7 @@ func mergeProcessTraces(mappings []processMapping) ([]span, error) { | |||||
| 1530 | for _, m := range mappings { | 1530 | for _, m := range mappings { | ||
| 1531 | f, err := os.Open(m.TracePath) | 1531 | f, err := os.Open(m.TracePath) | ||
| 1532 | if err != nil { | 1532 | if err != nil { | ||
| 1533 | - | return nil, err | 1533 | + | return nil, fmt.Errorf("open manifest trace for %s role: %w", m.Role, err) |
| 1534 | } | 1534 | } | ||
| 1535 | var records []traceRecord | 1535 | var records []traceRecord | ||
| 1536 | scan := bufio.NewScanner(f) | 1536 | scan := bufio.NewScanner(f) | ||
M cmd/vev-perf-harness/main_test.go +2 -2
| @@ -1271,8 +1271,8 @@ func TestHarnessRejectsMissingManifestRoleTrace(t *testing.T) { | |||
| 1271 | 1271 | {ProcessID: "daemon", ClockDomain: "daemon", TracePath: missing, Role: "daemon", Scenario: "s", Run: 1}, | |
| 1272 | 1272 | {ProcessID: "client", ClockDomain: "client", TracePath: client, Role: "client", Scenario: "s", Run: 1}, | |
| 1273 | 1273 | }) | |
| 1274 | - | if !errors.Is(err, os.ErrNotExist) { | |
| 1275 | - | t.Fatalf("missing daemon trace error = %v, want not exist", err) | |
| 1274 | + | if !errors.Is(err, os.ErrNotExist) || !strings.Contains(err.Error(), "daemon role") { | |
| 1275 | + | t.Fatalf("missing daemon trace error = %v, want daemon role not-exist error", err) | |
| 1276 | 1276 | } | |
| 1277 | 1277 | } | |
| 1278 | 1278 | ||
| @@ -1271,8 +1271,8 @@ func TestHarnessRejectsMissingManifestRoleTrace(t *testing.T) { | |||||
| 1271 | {ProcessID: "daemon", ClockDomain: "daemon", TracePath: missing, Role: "daemon", Scenario: "s", Run: 1}, | 1271 | {ProcessID: "daemon", ClockDomain: "daemon", TracePath: missing, Role: "daemon", Scenario: "s", Run: 1}, | ||
| 1272 | {ProcessID: "client", ClockDomain: "client", TracePath: client, Role: "client", Scenario: "s", Run: 1}, | 1272 | {ProcessID: "client", ClockDomain: "client", TracePath: client, Role: "client", Scenario: "s", Run: 1}, | ||
| 1273 | }) | 1273 | }) | ||
| 1274 | - | if !errors.Is(err, os.ErrNotExist) { | 1274 | + | if !errors.Is(err, os.ErrNotExist) || !strings.Contains(err.Error(), "daemon role") { |
| 1275 | - | t.Fatalf("missing daemon trace error = %v, want not exist", err) | 1275 | + | t.Fatalf("missing daemon trace error = %v, want daemon role not-exist error", err) |
| 1276 | } | 1276 | } | ||
| 1277 | } | 1277 | } | ||
| 1278 | 1278 | ||||