github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 01:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfer: fixes for new merge semantics

Browse Source
This commit is contained in:
Peter Bourgon
2015-08-26 09:45:42 +01:00
parent d5ab8177f6
commit 8f55c74b27
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xfer/collector.go
View File

@@ -52,11 +52,11 @@ func (c *Collector) Report() report.Report {
c.reports = clean(c.reports, c.window)
report := report.MakeReport()
rpt := report.MakeReport()
for _, tr := range c.reports {
report.Merge(tr.report)
rpt = rpt.Merge(tr.report)
}
return report
return rpt
}
type timestampReport struct {

5
xfer/collector_test.go
View File

@@ -32,9 +32,10 @@ func TestCollector(t *testing.T) {
}
c.Add(r2)
merged := report.MakeReport()
merged.Merge(r1)
merged.Merge(r2)
merged = merged.Merge(r1)
merged = merged.Merge(r2)
if want, have := merged, c.Report(); !reflect.DeepEqual(want, have) {
t.Error(test.Diff(want, have))
}