github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-02 17:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug in containers being filtered by image name

Browse Source
This commit is contained in:
Paul Bellamy
2016-01-26 14:45:10 +00:00
parent 599bade33f
commit b5037f511c
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
render/topologies.go
View File

@@ -140,7 +140,7 @@ func (r containerWithImageNameRenderer) Render(rpt report.Report) RenderableNode
continue
}
c.Rank = ImageNameWithoutVersion(image.LabelMajor)
c.Latest = c.Latest.Merge(c.Latest)
c.Latest = image.Latest.Merge(c.Latest)
containers[id] = c
}

14
render/topologies_test.go
View File

@@ -51,6 +51,20 @@ func TestContainerFilterRenderer(t *testing.T) {
}
}
func TestContainerFilterRendererImageName(t *testing.T) {
// Test nodes are filtered by image name as well.
input := fixture.Report.Copy()
input.ContainerImage.Nodes[fixture.ClientContainerImageNodeID] = input.ContainerImage.Nodes[fixture.ClientContainerImageNodeID].WithLatests(map[string]string{
docker.ImageName: "beta.gcr.io/google_containers/pause",
})
have := render.FilterSystem(render.ContainerWithImageNameRenderer).Render(input).Prune()
want := expected.RenderedContainers.Copy()
delete(want, expected.ClientContainerRenderedID)
if !reflect.DeepEqual(want, have) {
t.Error(test.Diff(want, have))
}
}
func TestContainerImageRenderer(t *testing.T) {
have := render.ContainerImageRenderer.Render(fixture.Report).Prune()
want := expected.RenderedContainerImages