github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-02-14 18:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3752 from weaveworks/report-window

Browse Source 
Set timestamp and window on each report
This commit is contained in:
Bryan Boreham
2020-03-11 21:12:02 +00:00
committed by GitHub
parent aee14088db 72145dc378
commit ba9ecdd9e2
6 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/collector_test.go
View File

@@ -50,8 +50,8 @@ func TestCollector(t *testing.T) {
c.Add(ctx, r2, nil)
merged := report.MakeReport()
merged = merged.Merge(r1)
merged = merged.Merge(r2)
merged.UnsafeMerge(r1)
merged.UnsafeMerge(r2)
have, err = c.Report(ctx, mtime.Now())
if err != nil {
t.Error(err)