From d2ad965ad90deda0c8f2c500ac8799e0be3809af Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Thu, 16 Jun 2016 18:12:10 +0100 Subject: [PATCH] Fix test --- render/detailed/node_test.go | 8 ++++---- render/detailed/parents_test.go | 10 +++++----- render/detailed/summary_test.go | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/render/detailed/node_test.go b/render/detailed/node_test.go index e17634e905..d562cbd9b4 100644 --- a/render/detailed/node_test.go +++ b/render/detailed/node_test.go @@ -17,7 +17,7 @@ import ( ) func child(t *testing.T, r render.Renderer, id string) detailed.NodeSummary { - s, ok := detailed.MakeNodeSummary(fixture.Report, r.Render(fixture.Report, render.FilterNoop)[id]) + s, ok := detailed.MakeNodeSummary(fixture.Report, r.Render(fixture.Report, nil)[id]) if !ok { t.Fatalf("Expected node %s to be summarizable, but wasn't", id) } @@ -25,7 +25,7 @@ func child(t *testing.T, r render.Renderer, id string) detailed.NodeSummary { } func TestMakeDetailedHostNode(t *testing.T) { - renderableNodes := render.HostRenderer.Render(fixture.Report, render.FilterNoop) + renderableNodes := render.HostRenderer.Render(fixture.Report, nil) renderableNode := renderableNodes[fixture.ClientHostNodeID] have := detailed.MakeNode("hosts", fixture.Report, renderableNodes, renderableNode) @@ -176,7 +176,7 @@ func TestMakeDetailedHostNode(t *testing.T) { func TestMakeDetailedContainerNode(t *testing.T) { id := fixture.ServerContainerNodeID - renderableNodes := render.ContainerRenderer.Render(fixture.Report, render.FilterNoop) + renderableNodes := render.ContainerRenderer.Render(fixture.Report, nil) renderableNode, ok := renderableNodes[id] if !ok { t.Fatalf("Node not found: %s", id) @@ -308,7 +308,7 @@ func TestMakeDetailedContainerNode(t *testing.T) { func TestMakeDetailedPodNode(t *testing.T) { id := fixture.ServerPodNodeID - renderableNodes := render.PodRenderer.Render(fixture.Report, render.FilterNoop) + renderableNodes := render.PodRenderer.Render(fixture.Report, nil) renderableNode, ok := renderableNodes[id] if !ok { t.Fatalf("Node not found: %s", id) diff --git a/render/detailed/parents_test.go b/render/detailed/parents_test.go index 1fbd5e3d2e..0e783bca36 100644 --- a/render/detailed/parents_test.go +++ b/render/detailed/parents_test.go @@ -20,23 +20,23 @@ func TestParents(t *testing.T) { }{ { name: "Node accidentally tagged with itself", - node: render.HostRenderer.Render(fixture.Report, render.FilterNoop)[fixture.ClientHostNodeID].WithParents( + node: render.HostRenderer.Render(fixture.Report, nil)[fixture.ClientHostNodeID].WithParents( report.EmptySets.Add(report.Host, report.MakeStringSet(fixture.ClientHostNodeID)), ), want: nil, }, { - node: render.HostRenderer.Render(fixture.Report, render.FilterNoop)[fixture.ClientHostNodeID], + node: render.HostRenderer.Render(fixture.Report, nil)[fixture.ClientHostNodeID], want: nil, }, { - node: render.ContainerImageRenderer.Render(fixture.Report, render.FilterNoop)[fixture.ClientContainerImageNodeID], + node: render.ContainerImageRenderer.Render(fixture.Report, nil)[fixture.ClientContainerImageNodeID], want: []detailed.Parent{ {ID: fixture.ClientHostNodeID, Label: fixture.ClientHostName, TopologyID: "hosts"}, }, }, { - node: render.ContainerRenderer.Render(fixture.Report, render.FilterNoop)[fixture.ClientContainerNodeID], + node: render.ContainerRenderer.Render(fixture.Report, nil)[fixture.ClientContainerNodeID], want: []detailed.Parent{ {ID: fixture.ClientContainerImageNodeID, Label: fixture.ClientContainerImageName, TopologyID: "containers-by-image"}, {ID: fixture.ClientHostNodeID, Label: fixture.ClientHostName, TopologyID: "hosts"}, @@ -44,7 +44,7 @@ func TestParents(t *testing.T) { }, }, { - node: render.ProcessRenderer.Render(fixture.Report, render.FilterNoop)[fixture.ClientProcess1NodeID], + node: render.ProcessRenderer.Render(fixture.Report, nil)[fixture.ClientProcess1NodeID], want: []detailed.Parent{ {ID: fixture.ClientContainerNodeID, Label: fixture.ClientContainerName, TopologyID: "containers"}, {ID: fixture.ClientContainerImageNodeID, Label: fixture.ClientContainerImageName, TopologyID: "containers-by-image"}, diff --git a/render/detailed/summary_test.go b/render/detailed/summary_test.go index cfe1021ec6..02f4a80acf 100644 --- a/render/detailed/summary_test.go +++ b/render/detailed/summary_test.go @@ -21,7 +21,7 @@ import ( func TestSummaries(t *testing.T) { { // Just a convenient source of some rendered nodes - have := detailed.Summaries(fixture.Report, render.ProcessRenderer.Render(fixture.Report, render.FilterNoop)) + have := detailed.Summaries(fixture.Report, render.ProcessRenderer.Render(fixture.Report, nil)) // The ids of the processes rendered above expectedIDs := []string{ fixture.ClientProcess1NodeID, @@ -51,7 +51,7 @@ func TestSummaries(t *testing.T) { input := fixture.Report.Copy() input.Process.Nodes[fixture.ClientProcess1NodeID] = input.Process.Nodes[fixture.ClientProcess1NodeID].WithMetrics(report.Metrics{process.CPUUsage: metric}) - have := detailed.Summaries(input, render.ProcessRenderer.Render(input, render.FilterNoop)) + have := detailed.Summaries(input, render.ProcessRenderer.Render(input, nil)) node, ok := have[fixture.ClientProcess1NodeID] if !ok {