Fixup failing tests due to fixture move.

app/api_topologies_test.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/weaveworks/scope/probe/kubernetes"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
+	"github.com/weaveworks/scope/test/fixture"
 )
 
 func TestAPITopology(t *testing.T) {
@@ -62,7 +62,7 @@ func TestAPITopologyAddsKubernetes(t *testing.T) {
 	// Enable the kubernetes topologies
 	rpt := report.MakeReport()
 	rpt.Pod = report.MakeTopology()
-	rpt.Pod.Nodes[test.ClientPodNodeID] = kubernetes.NewPod(&api.Pod{
+	rpt.Pod.Nodes[fixture.ClientPodNodeID] = kubernetes.NewPod(&api.Pod{
 		ObjectMeta: api.ObjectMeta{
 			Name:      "pong-a",
 			Namespace: "ping",

render/expected/expected.go

@@ -377,14 +377,14 @@ var (
 			Rank:       "ping/pong-a",
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.Client54001NodeID,
-				test.Client54002NodeID,
-				test.ClientProcess1NodeID,
-				test.ClientProcess2NodeID,
-				test.ClientHostNodeID,
-				test.ClientContainerNodeID,
-				test.ClientContainerImageNodeID,
-				test.ClientPodNodeID,
+				fixture.Client54001NodeID,
+				fixture.Client54002NodeID,
+				fixture.ClientProcess1NodeID,
+				fixture.ClientProcess2NodeID,
+				fixture.ClientHostNodeID,
+				fixture.ClientContainerNodeID,
+				fixture.ClientContainerImageNodeID,
+				fixture.ClientPodNodeID,
 			),
 			Node: report.MakeNode().WithAdjacent("ping/pong-b"),
 			EdgeMetadata: report.EdgeMetadata{
@@ -399,12 +399,12 @@ var (
 			Rank:       "ping/pong-b",
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.Server80NodeID,
-				test.ServerPodNodeID,
-				test.ServerProcessNodeID,
-				test.ServerContainerNodeID,
-				test.ServerHostNodeID,
-				test.ServerContainerImageNodeID,
+				fixture.Server80NodeID,
+				fixture.ServerPodNodeID,
+				fixture.ServerProcessNodeID,
+				fixture.ServerContainerNodeID,
+				fixture.ServerHostNodeID,
+				fixture.ServerContainerImageNodeID,
 			),
 			Node: report.MakeNode(),
 			EdgeMetadata: report.EdgeMetadata{
@@ -415,13 +415,13 @@ var (
 		uncontainedServerID: {
 			ID:         uncontainedServerID,
 			LabelMajor: render.UncontainedMajor,
-			LabelMinor: test.ServerHostName,
+			LabelMinor: fixture.ServerHostName,
 			Rank:       "",
 			Pseudo:     true,
 			Origins: report.MakeIDList(
-				test.ServerHostNodeID,
-				test.NonContainerProcessNodeID,
-				test.NonContainerNodeID,
+				fixture.ServerHostNodeID,
+				fixture.NonContainerProcessNodeID,
+				fixture.NonContainerNodeID,
 			),
 			Node:         report.MakeNode().WithAdjacent(render.TheInternetID),
 			EdgeMetadata: report.EdgeMetadata{},
@@ -436,37 +436,37 @@ var (
 				EgressByteCount:   newu64(600),
 			},
 			Origins: report.MakeIDList(
-				test.RandomClientNodeID,
-				test.GoogleEndpointNodeID,
+				fixture.RandomClientNodeID,
+				fixture.GoogleEndpointNodeID,
 			),
 		},
 	}).Prune()
 
 	RenderedPodServices = (render.RenderableNodes{
 		"ping/pongservice": {
-			ID:         test.ServiceID,
+			ID:         fixture.ServiceID,
 			LabelMajor: "pongservice",
 			LabelMinor: "2 pods",
-			Rank:       test.ServiceID,
+			Rank:       fixture.ServiceID,
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.Client54001NodeID,
-				test.Client54002NodeID,
-				test.ClientProcess1NodeID,
-				test.ClientProcess2NodeID,
-				test.ClientHostNodeID,
-				test.ClientContainerNodeID,
-				test.ClientContainerImageNodeID,
-				test.ClientPodNodeID,
-				test.Server80NodeID,
-				test.ServerPodNodeID,
-				test.ServiceNodeID,
-				test.ServerProcessNodeID,
-				test.ServerContainerNodeID,
-				test.ServerHostNodeID,
-				test.ServerContainerImageNodeID,
+				fixture.Client54001NodeID,
+				fixture.Client54002NodeID,
+				fixture.ClientProcess1NodeID,
+				fixture.ClientProcess2NodeID,
+				fixture.ClientHostNodeID,
+				fixture.ClientContainerNodeID,
+				fixture.ClientContainerImageNodeID,
+				fixture.ClientPodNodeID,
+				fixture.Server80NodeID,
+				fixture.ServerPodNodeID,
+				fixture.ServiceNodeID,
+				fixture.ServerProcessNodeID,
+				fixture.ServerContainerNodeID,
+				fixture.ServerHostNodeID,
+				fixture.ServerContainerImageNodeID,
 			),
-			Node: report.MakeNode().WithAdjacent(test.ServiceID), // ?? Shouldn't be adjacent to itself?
+			Node: report.MakeNode().WithAdjacent(fixture.ServiceID), // ?? Shouldn't be adjacent to itself?
 			EdgeMetadata: report.EdgeMetadata{
 				EgressPacketCount:  newu64(30),
 				EgressByteCount:    newu64(300),
@@ -477,13 +477,13 @@ var (
 		uncontainedServerID: {
 			ID:         uncontainedServerID,
 			LabelMajor: render.UncontainedMajor,
-			LabelMinor: test.ServerHostName,
+			LabelMinor: fixture.ServerHostName,
 			Rank:       "",
 			Pseudo:     true,
 			Origins: report.MakeIDList(
-				test.ServerHostNodeID,
-				test.NonContainerProcessNodeID,
-				test.NonContainerNodeID,
+				fixture.ServerHostNodeID,
+				fixture.NonContainerProcessNodeID,
+				fixture.NonContainerNodeID,
 			),
 			Node:         report.MakeNode().WithAdjacent(render.TheInternetID),
 			EdgeMetadata: report.EdgeMetadata{},
@@ -492,14 +492,14 @@ var (
 			ID:         render.TheInternetID,
 			LabelMajor: render.TheInternetMajor,
 			Pseudo:     true,
-			Node:       report.MakeNode().WithAdjacent(test.ServiceID),
+			Node:       report.MakeNode().WithAdjacent(fixture.ServiceID),
 			EdgeMetadata: report.EdgeMetadata{
 				EgressPacketCount: newu64(60),
 				EgressByteCount:   newu64(600),
 			},
 			Origins: report.MakeIDList(
-				test.RandomClientNodeID,
-				test.GoogleEndpointNodeID,
+				fixture.RandomClientNodeID,
+				fixture.GoogleEndpointNodeID,
 			),
 		},
 	}).Prune()

render/topologies_test.go

@@ -66,7 +66,7 @@ func TestHostRenderer(t *testing.T) {
 }
 
 func TestPodRenderer(t *testing.T) {
-	have := render.PodRenderer.Render(test.Report).Prune()
+	have := render.PodRenderer.Render(fixture.Report).Prune()
 	want := expected.RenderedPods
 	if !reflect.DeepEqual(want, have) {
 		t.Error(test.Diff(want, have))
@@ -76,22 +76,22 @@ func TestPodRenderer(t *testing.T) {
 func TestPodFilterRenderer(t *testing.T) {
 	// tag on containers or pod namespace in the topology and ensure
 	// it is filtered out correctly.
-	input := test.Report.Copy()
-	input.Pod.Nodes[test.ClientPodNodeID].Metadata[kubernetes.PodID] = "kube-system/foo"
-	input.Pod.Nodes[test.ClientPodNodeID].Metadata[kubernetes.Namespace] = "kube-system"
-	input.Pod.Nodes[test.ClientPodNodeID].Metadata[kubernetes.PodName] = "foo"
-	input.Container.Nodes[test.ClientContainerNodeID].Metadata[docker.LabelPrefix+"io.kubernetes.pod.name"] = "kube-system/foo"
+	input := fixture.Report.Copy()
+	input.Pod.Nodes[fixture.ClientPodNodeID].Metadata[kubernetes.PodID] = "kube-system/foo"
+	input.Pod.Nodes[fixture.ClientPodNodeID].Metadata[kubernetes.Namespace] = "kube-system"
+	input.Pod.Nodes[fixture.ClientPodNodeID].Metadata[kubernetes.PodName] = "foo"
+	input.Container.Nodes[fixture.ClientContainerNodeID].Metadata[docker.LabelPrefix+"io.kubernetes.pod.name"] = "kube-system/foo"
 	have := render.FilterSystem(render.PodRenderer).Render(input).Prune()
 	want := expected.RenderedPods.Copy()
-	delete(want, test.ClientPodID)
-	delete(want, test.ClientContainerID)
+	delete(want, fixture.ClientPodID)
+	delete(want, fixture.ClientContainerID)
 	if !reflect.DeepEqual(want, have) {
 		t.Error(test.Diff(want, have))
 	}
 }
 
 func TestPodServiceRenderer(t *testing.T) {
-	have := render.PodServiceRenderer.Render(test.Report).Prune()
+	have := render.PodServiceRenderer.Render(fixture.Report).Prune()
 	want := expected.RenderedPodServices
 	if !reflect.DeepEqual(want, have) {
 		t.Error(test.Diff(want, have))