Skip to content

Commit f6854b1

Browse files
committed
fix tests
1 parent a482c47 commit f6854b1

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

tools/flakeguard/reports/data.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,15 @@ func aggregate(reportChan <-chan *TestReport) (*TestReport, error) {
179179
return fullReport, nil
180180
}
181181

182+
func aggregateFromReports(reports ...*TestReport) (*TestReport, error) {
183+
reportChan := make(chan *TestReport, len(reports))
184+
for _, report := range reports {
185+
reportChan <- report
186+
}
187+
close(reportChan)
188+
return aggregate(reportChan)
189+
}
190+
182191
func mergeTestResults(a, b TestResult) TestResult {
183192
a.Runs += b.Runs
184193
a.Durations = append(a.Durations, b.Durations...)

tools/flakeguard/reports/data_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ func TestAggregate(t *testing.T) {
287287
},
288288
}
289289

290-
aggregatedReport, err := aggregate(report1, report2)
290+
aggregatedReport, err := aggregateFromReports(report1, report2)
291291
if err != nil {
292292
t.Fatalf("Error aggregating reports: %v", err)
293293
}
@@ -371,7 +371,7 @@ func TestAggregateOutputs(t *testing.T) {
371371
},
372372
}
373373

374-
aggregatedReport, err := aggregate(report1, report2)
374+
aggregatedReport, err := aggregateFromReports(report1, report2)
375375
if err != nil {
376376
t.Fatalf("Error aggregating reports: %v", err)
377377
}
@@ -432,7 +432,7 @@ func TestAggregateIdenticalOutputs(t *testing.T) {
432432
},
433433
}
434434

435-
aggregatedReport, err := aggregate(report1, report2)
435+
aggregatedReport, err := aggregateFromReports(report1, report2)
436436
if err != nil {
437437
t.Fatalf("Error aggregating reports: %v", err)
438438
}
@@ -569,7 +569,7 @@ func TestAggregate_AllSkippedTests(t *testing.T) {
569569
},
570570
}
571571

572-
aggregatedReport, err := aggregate(report1, report2)
572+
aggregatedReport, err := aggregateFromReports(report1, report2)
573573
if err != nil {
574574
t.Fatalf("Error aggregating reports: %v", err)
575575
}

0 commit comments

Comments
 (0)