Move fixture to its own package

We want to be able to import test from packages like probe/endpoint, in
order to use utility functions like poll. But that causes an import
cycle with the current layout. We got around this using dot-imports so
far, but it's ugly and unnecessary: fixture can be its own package.

app/api_topology_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/weaveworks/scope/render/expected"
 	"github.com/weaveworks/scope/report"
 	"github.com/weaveworks/scope/test"
+	"github.com/weaveworks/scope/test/fixture"
 )
 
 func TestAll(t *testing.T) {
@@ -78,7 +79,7 @@ func TestAPITopologyApplications(t *testing.T) {
 		}
 		equals(t, expected.ServerProcessID, node.Node.ID)
 		equals(t, "apache", node.Node.LabelMajor)
-		equals(t, fmt.Sprintf("%s (server:%s)", test.ServerHostID, test.ServerPID), node.Node.LabelMinor)
+		equals(t, fmt.Sprintf("%s (server:%s)", fixture.ServerHostID, fixture.ServerPID), node.Node.LabelMinor)
 		equals(t, false, node.Node.Pseudo)
 		// Let's not unit-test the specific content of the detail tables
 	}

app/mock_reporter_test.go

@@ -2,12 +2,12 @@ package main
 
 import (
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
+	"github.com/weaveworks/scope/test/fixture"
 )
 
 // StaticReport is used as a fixture in tests. It emulates an xfer.Collector.
 type StaticReport struct{}
 
-func (s StaticReport) Report() report.Report { return test.Report }
+func (s StaticReport) Report() report.Report { return fixture.Report }
 
 func (s StaticReport) Add(report.Report) {}

app/origin_host_test.go

@@ -6,7 +6,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/weaveworks/scope/test"
+	"github.com/weaveworks/scope/test/fixture"
 )
 
 func TestAPIOriginHost(t *testing.T) {
@@ -18,7 +18,7 @@ func TestAPIOriginHost(t *testing.T) {
 
 	{
 		// Origin
-		body := getRawJSON(t, ts, fmt.Sprintf("/api/origin/host/%s", test.ServerHostNodeID))
+		body := getRawJSON(t, ts, fmt.Sprintf("/api/origin/host/%s", fixture.ServerHostNodeID))
 		var o OriginHost
 		if err := json.Unmarshal(body, &o); err != nil {
 			t.Fatalf("JSON parse error: %s", err)

render/detailed_node_test.go

@@ -7,20 +7,21 @@ import (
 
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/test"
+	"github.com/weaveworks/scope/test/fixture"
 )
 
 func TestOriginTable(t *testing.T) {
-	if _, ok := render.OriginTable(test.Report, "not-found", false, false); ok {
+	if _, ok := render.OriginTable(fixture.Report, "not-found", false, false); ok {
 		t.Errorf("unknown origin ID gave unexpected success")
 	}
-	for originID, want := range map[string]render.Table{test.ServerProcessNodeID: {
-		Title:   fmt.Sprintf(`Process "apache" (%s)`, test.ServerPID),
+	for originID, want := range map[string]render.Table{fixture.ServerProcessNodeID: {
+		Title:   fmt.Sprintf(`Process "apache" (%s)`, fixture.ServerPID),
 		Numeric: false,
 		Rank:    2,
 		Rows:    []render.Row{},
 	},
-		test.ServerHostNodeID: {
-			Title:   fmt.Sprintf("Host %q", test.ServerHostName),
+		fixture.ServerHostNodeID: {
+			Title:   fmt.Sprintf("Host %q", fixture.ServerHostName),
 			Numeric: false,
 			Rank:    1,
 			Rows: []render.Row{
@@ -29,7 +30,7 @@ func TestOriginTable(t *testing.T) {
 			},
 		},
 	} {
-		have, ok := render.OriginTable(test.Report, originID, false, false)
+		have, ok := render.OriginTable(fixture.Report, originID, false, false)
 		if !ok {
 			t.Errorf("%q: not OK", originID)
 			continue
@@ -41,23 +42,23 @@ func TestOriginTable(t *testing.T) {
 
 	// Test host/container tags
 	for originID, want := range map[string]render.Table{
-		test.ServerProcessNodeID: {
-			Title:   fmt.Sprintf(`Process "apache" (%s)`, test.ServerPID),
+		fixture.ServerProcessNodeID: {
+			Title:   fmt.Sprintf(`Process "apache" (%s)`, fixture.ServerPID),
 			Numeric: false,
 			Rank:    2,
 			Rows: []render.Row{
-				{"Host", test.ServerHostID, "", false},
-				{"Container ID", test.ServerContainerID, "", false},
+				{"Host", fixture.ServerHostID, "", false},
+				{"Container ID", fixture.ServerContainerID, "", false},
 			},
 		},
-		test.ServerContainerNodeID: {
+		fixture.ServerContainerNodeID: {
 			Title:   `Container "server"`,
 			Numeric: false,
 			Rank:    3,
 			Rows: []render.Row{
-				{"Host", test.ServerHostID, "", false},
-				{"ID", test.ServerContainerID, "", false},
-				{"Image ID", test.ServerContainerImageID, "", false},
+				{"Host", fixture.ServerHostID, "", false},
+				{"ID", fixture.ServerContainerID, "", false},
+				{"Image ID", fixture.ServerContainerImageID, "", false},
 				{fmt.Sprintf(`Label %q`, render.AmazonECSContainerNameLabel), `server`, "", false},
 				{`Label "foo1"`, `bar1`, "", false},
 				{`Label "foo2"`, `bar2`, "", false},
@@ -65,7 +66,7 @@ func TestOriginTable(t *testing.T) {
 			},
 		},
 	} {
-		have, ok := render.OriginTable(test.Report, originID, true, true)
+		have, ok := render.OriginTable(fixture.Report, originID, true, true)
 		if !ok {
 			t.Errorf("%q: not OK", originID)
 			continue
@@ -78,16 +79,16 @@ func TestOriginTable(t *testing.T) {
 }
 
 func TestMakeDetailedHostNode(t *testing.T) {
-	renderableNode := render.HostRenderer.Render(test.Report)[render.MakeHostID(test.ClientHostID)]
-	have := render.MakeDetailedNode(test.Report, renderableNode)
+	renderableNode := render.HostRenderer.Render(fixture.Report)[render.MakeHostID(fixture.ClientHostID)]
+	have := render.MakeDetailedNode(fixture.Report, renderableNode)
 	want := render.DetailedNode{
-		ID:         render.MakeHostID(test.ClientHostID),
+		ID:         render.MakeHostID(fixture.ClientHostID),
 		LabelMajor: "client",
 		LabelMinor: "hostname.com",
 		Pseudo:     false,
 		Tables: []render.Table{
 			{
-				Title:   fmt.Sprintf("Host %q", test.ClientHostName),
+				Title:   fmt.Sprintf("Host %q", fixture.ClientHostName),
 				Numeric: false,
 				Rank:    1,
 				Rows: []render.Row{
@@ -135,12 +136,12 @@ func TestMakeDetailedHostNode(t *testing.T) {
 }
 
 func TestMakeDetailedContainerNode(t *testing.T) {
-	renderableNode := render.ContainerRenderer.Render(test.Report)[test.ServerContainerID]
-	have := render.MakeDetailedNode(test.Report, renderableNode)
+	renderableNode := render.ContainerRenderer.Render(fixture.Report)[fixture.ServerContainerID]
+	have := render.MakeDetailedNode(fixture.Report, renderableNode)
 	want := render.DetailedNode{
-		ID:         test.ServerContainerID,
+		ID:         fixture.ServerContainerID,
 		LabelMajor: "server",
-		LabelMinor: test.ServerHostName,
+		LabelMinor: fixture.ServerHostName,
 		Pseudo:     false,
 		Tables: []render.Table{
 			{
@@ -148,7 +149,7 @@ func TestMakeDetailedContainerNode(t *testing.T) {
 				Numeric: false,
 				Rank:    4,
 				Rows: []render.Row{
-					{"Image ID", test.ServerContainerImageID, "", false},
+					{"Image ID", fixture.ServerContainerImageID, "", false},
 					{`Label "foo1"`, `bar1`, "", false},
 					{`Label "foo2"`, `bar2`, "", false},
 				},
@@ -158,8 +159,8 @@ func TestMakeDetailedContainerNode(t *testing.T) {
 				Numeric: false,
 				Rank:    3,
 				Rows: []render.Row{
-					{"ID", test.ServerContainerID, "", false},
-					{"Image ID", test.ServerContainerImageID, "", false},
+					{"ID", fixture.ServerContainerID, "", false},
+					{"Image ID", fixture.ServerContainerImageID, "", false},
 					{fmt.Sprintf(`Label %q`, render.AmazonECSContainerNameLabel), `server`, "", false},
 					{`Label "foo1"`, `bar1`, "", false},
 					{`Label "foo2"`, `bar2`, "", false},
@@ -167,13 +168,13 @@ func TestMakeDetailedContainerNode(t *testing.T) {
 				},
 			},
 			{
-				Title:   fmt.Sprintf(`Process "apache" (%s)`, test.ServerPID),
+				Title:   fmt.Sprintf(`Process "apache" (%s)`, fixture.ServerPID),
 				Numeric: false,
 				Rank:    2,
 				Rows:    []render.Row{},
 			},
 			{
-				Title:   fmt.Sprintf("Host %q", test.ServerHostName),
+				Title:   fmt.Sprintf("Host %q", fixture.ServerHostName),
 				Numeric: false,
 				Rank:    1,
 				Rows: []render.Row{
@@ -190,38 +191,38 @@ func TestMakeDetailedContainerNode(t *testing.T) {
 					{"Ingress byte rate", "1.0", "KBps", false},
 					{"Client", "Server", "", true},
 					{
-						fmt.Sprintf("%s:%s", test.UnknownClient1IP, test.UnknownClient1Port),
-						fmt.Sprintf("%s:%s", test.ServerIP, test.ServerPort),
+						fmt.Sprintf("%s:%s", fixture.UnknownClient1IP, fixture.UnknownClient1Port),
+						fmt.Sprintf("%s:%s", fixture.ServerIP, fixture.ServerPort),
 						"",
 						true,
 					},
 					{
-						fmt.Sprintf("%s:%s", test.UnknownClient2IP, test.UnknownClient2Port),
-						fmt.Sprintf("%s:%s", test.ServerIP, test.ServerPort),
+						fmt.Sprintf("%s:%s", fixture.UnknownClient2IP, fixture.UnknownClient2Port),
+						fmt.Sprintf("%s:%s", fixture.ServerIP, fixture.ServerPort),
 						"",
 						true,
 					},
 					{
-						fmt.Sprintf("%s:%s", test.UnknownClient3IP, test.UnknownClient3Port),
-						fmt.Sprintf("%s:%s", test.ServerIP, test.ServerPort),
+						fmt.Sprintf("%s:%s", fixture.UnknownClient3IP, fixture.UnknownClient3Port),
+						fmt.Sprintf("%s:%s", fixture.ServerIP, fixture.ServerPort),
 						"",
 						true,
 					},
 					{
-						fmt.Sprintf("%s:%s", test.ClientIP, test.ClientPort54001),
-						fmt.Sprintf("%s:%s", test.ServerIP, test.ServerPort),
+						fmt.Sprintf("%s:%s", fixture.ClientIP, fixture.ClientPort54001),
+						fmt.Sprintf("%s:%s", fixture.ServerIP, fixture.ServerPort),
 						"",
 						true,
 					},
 					{
-						fmt.Sprintf("%s:%s", test.ClientIP, test.ClientPort54002),
-						fmt.Sprintf("%s:%s", test.ServerIP, test.ServerPort),
+						fmt.Sprintf("%s:%s", fixture.ClientIP, fixture.ClientPort54002),
+						fmt.Sprintf("%s:%s", fixture.ServerIP, fixture.ServerPort),
 						"",
 						true,
 					},
 					{
-						fmt.Sprintf("%s:%s", test.RandomClientIP, test.RandomClientPort),
-						fmt.Sprintf("%s:%s", test.ServerIP, test.ServerPort),
+						fmt.Sprintf("%s:%s", fixture.RandomClientIP, fixture.RandomClientPort),
+						fmt.Sprintf("%s:%s", fixture.ServerIP, fixture.ServerPort),
 						"",
 						true,
 					},

render/expected/expected.go

@@ -5,14 +5,14 @@ import (
 
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
+	"github.com/weaveworks/scope/test/fixture"
 )
 
 // Exported for testing.
 var (
-	uncontainedServerID  = render.MakePseudoNodeID(render.UncontainedID, test.ServerHostName)
-	unknownPseudoNode1ID = render.MakePseudoNodeID("10.10.10.10", test.ServerIP, "80")
-	unknownPseudoNode2ID = render.MakePseudoNodeID("10.10.10.11", test.ServerIP, "80")
+	uncontainedServerID  = render.MakePseudoNodeID(render.UncontainedID, fixture.ServerHostName)
+	unknownPseudoNode1ID = render.MakePseudoNodeID("10.10.10.10", fixture.ServerIP, "80")
+	unknownPseudoNode2ID = render.MakePseudoNodeID("10.10.10.11", fixture.ServerIP, "80")
 	unknownPseudoNode1   = func(adjacent string) render.RenderableNode {
 		return render.RenderableNode{
 			ID:         unknownPseudoNode1ID,
@@ -24,8 +24,8 @@ var (
 				EgressByteCount:   newu64(700),
 			},
 			Origins: report.MakeIDList(
-				test.UnknownClient1NodeID,
-				test.UnknownClient2NodeID,
+				fixture.UnknownClient1NodeID,
+				fixture.UnknownClient2NodeID,
 			),
 		}
 	}
@@ -40,7 +40,7 @@ var (
 				EgressByteCount:   newu64(500),
 			},
 			Origins: report.MakeIDList(
-				test.UnknownClient3NodeID,
+				fixture.UnknownClient3NodeID,
 			),
 		}
 	}
@@ -55,27 +55,27 @@ var (
 				EgressByteCount:   newu64(600),
 			},
 			Origins: report.MakeIDList(
-				test.RandomClientNodeID,
-				test.GoogleEndpointNodeID,
+				fixture.RandomClientNodeID,
+				fixture.GoogleEndpointNodeID,
 			),
 		}
 	}
-	ClientProcess1ID      = render.MakeProcessID(test.ClientHostID, test.Client1PID)
-	ClientProcess2ID      = render.MakeProcessID(test.ClientHostID, test.Client2PID)
-	ServerProcessID       = render.MakeProcessID(test.ServerHostID, test.ServerPID)
-	nonContainerProcessID = render.MakeProcessID(test.ServerHostID, test.NonContainerPID)
+	ClientProcess1ID      = render.MakeProcessID(fixture.ClientHostID, fixture.Client1PID)
+	ClientProcess2ID      = render.MakeProcessID(fixture.ClientHostID, fixture.Client2PID)
+	ServerProcessID       = render.MakeProcessID(fixture.ServerHostID, fixture.ServerPID)
+	nonContainerProcessID = render.MakeProcessID(fixture.ServerHostID, fixture.NonContainerPID)
 
 	RenderedProcesses = (render.RenderableNodes{
 		ClientProcess1ID: {
 			ID:         ClientProcess1ID,
-			LabelMajor: test.Client1Comm,
-			LabelMinor: fmt.Sprintf("%s (%s)", test.ClientHostID, test.Client1PID),
-			Rank:       test.Client1Comm,
+			LabelMajor: fixture.Client1Comm,
+			LabelMinor: fmt.Sprintf("%s (%s)", fixture.ClientHostID, fixture.Client1PID),
+			Rank:       fixture.Client1Comm,
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.Client54001NodeID,
-				test.ClientProcess1NodeID,
-				test.ClientHostNodeID,
+				fixture.Client54001NodeID,
+				fixture.ClientProcess1NodeID,
+				fixture.ClientHostNodeID,
 			),
 			Node: report.MakeNode().WithAdjacent(ServerProcessID),
 			EdgeMetadata: report.EdgeMetadata{
@@ -85,14 +85,14 @@ var (
 		},
 		ClientProcess2ID: {
 			ID:         ClientProcess2ID,
-			LabelMajor: test.Client2Comm,
-			LabelMinor: fmt.Sprintf("%s (%s)", test.ClientHostID, test.Client2PID),
-			Rank:       test.Client2Comm,
+			LabelMajor: fixture.Client2Comm,
+			LabelMinor: fmt.Sprintf("%s (%s)", fixture.ClientHostID, fixture.Client2PID),
+			Rank:       fixture.Client2Comm,
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.Client54002NodeID,
-				test.ClientProcess2NodeID,
-				test.ClientHostNodeID,
+				fixture.Client54002NodeID,
+				fixture.ClientProcess2NodeID,
+				fixture.ClientHostNodeID,
 			),
 			Node: report.MakeNode().WithAdjacent(ServerProcessID),
 			EdgeMetadata: report.EdgeMetadata{
@@ -103,13 +103,13 @@ var (
 		ServerProcessID: {
 			ID:         ServerProcessID,
 			LabelMajor: "apache",
-			LabelMinor: fmt.Sprintf("%s (%s)", test.ServerHostID, test.ServerPID),
-			Rank:       test.ServerComm,
+			LabelMinor: fmt.Sprintf("%s (%s)", fixture.ServerHostID, fixture.ServerPID),
+			Rank:       fixture.ServerComm,
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.Server80NodeID,
-				test.ServerProcessNodeID,
-				test.ServerHostNodeID,
+				fixture.Server80NodeID,
+				fixture.ServerProcessNodeID,
+				fixture.ServerHostNodeID,
 			),
 			Node: report.MakeNode(),
 			EdgeMetadata: report.EdgeMetadata{
@@ -119,14 +119,14 @@ var (
 		},
 		nonContainerProcessID: {
 			ID:         nonContainerProcessID,
-			LabelMajor: test.NonContainerComm,
-			LabelMinor: fmt.Sprintf("%s (%s)", test.ServerHostID, test.NonContainerPID),
-			Rank:       test.NonContainerComm,
+			LabelMajor: fixture.NonContainerComm,
+			LabelMinor: fmt.Sprintf("%s (%s)", fixture.ServerHostID, fixture.NonContainerPID),
+			Rank:       fixture.NonContainerComm,
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.NonContainerProcessNodeID,
-				test.ServerHostNodeID,
-				test.NonContainerNodeID,
+				fixture.NonContainerProcessNodeID,
+				fixture.ServerHostNodeID,
+				fixture.NonContainerNodeID,
 			),
 			Node:         report.MakeNode().WithAdjacent(render.TheInternetID),
 			EdgeMetadata: report.EdgeMetadata{},
@@ -144,11 +144,11 @@ var (
 			Rank:       "curl",
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.Client54001NodeID,
-				test.Client54002NodeID,
-				test.ClientProcess1NodeID,
-				test.ClientProcess2NodeID,
-				test.ClientHostNodeID,
+				fixture.Client54001NodeID,
+				fixture.Client54002NodeID,
+				fixture.ClientProcess1NodeID,
+				fixture.ClientProcess2NodeID,
+				fixture.ClientHostNodeID,
 			),
 			Node: report.MakeNode().WithAdjacent("apache"),
 			EdgeMetadata: report.EdgeMetadata{
@@ -163,9 +163,9 @@ var (
 			Rank:       "apache",
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.Server80NodeID,
-				test.ServerProcessNodeID,
-				test.ServerHostNodeID,
+				fixture.Server80NodeID,
+				fixture.ServerProcessNodeID,
+				fixture.ServerHostNodeID,
 			),
 			Node: report.MakeNode(),
 			EdgeMetadata: report.EdgeMetadata{
@@ -173,16 +173,16 @@ var (
 				IngressByteCount:   newu64(2100),
 			},
 		},
-		test.NonContainerComm: {
-			ID:         test.NonContainerComm,
-			LabelMajor: test.NonContainerComm,
+		fixture.NonContainerComm: {
+			ID:         fixture.NonContainerComm,
+			LabelMajor: fixture.NonContainerComm,
 			LabelMinor: "1 process",
-			Rank:       test.NonContainerComm,
+			Rank:       fixture.NonContainerComm,
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.NonContainerProcessNodeID,
-				test.ServerHostNodeID,
-				test.NonContainerNodeID,
+				fixture.NonContainerProcessNodeID,
+				fixture.ServerHostNodeID,
+				fixture.NonContainerNodeID,
 			),
 			Node:         report.MakeNode().WithAdjacent(render.TheInternetID),
 			EdgeMetadata: report.EdgeMetadata{},
@@ -193,39 +193,39 @@ var (
 	}).Prune()
 
 	RenderedContainers = (render.RenderableNodes{
-		test.ClientContainerID: {
-			ID:         test.ClientContainerID,
+		fixture.ClientContainerID: {
+			ID:         fixture.ClientContainerID,
 			LabelMajor: "client",
-			LabelMinor: test.ClientHostName,
-			Rank:       test.ClientContainerImageName,
+			LabelMinor: fixture.ClientHostName,
+			Rank:       fixture.ClientContainerImageName,
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.ClientContainerImageNodeID,
-				test.ClientContainerNodeID,
-				test.Client54001NodeID,
-				test.Client54002NodeID,
-				test.ClientProcess1NodeID,
-				test.ClientProcess2NodeID,
-				test.ClientHostNodeID,
+				fixture.ClientContainerImageNodeID,
+				fixture.ClientContainerNodeID,
+				fixture.Client54001NodeID,
+				fixture.Client54002NodeID,
+				fixture.ClientProcess1NodeID,
+				fixture.ClientProcess2NodeID,
+				fixture.ClientHostNodeID,
 			),
-			Node: report.MakeNode().WithAdjacent(test.ServerContainerID),
+			Node: report.MakeNode().WithAdjacent(fixture.ServerContainerID),
 			EdgeMetadata: report.EdgeMetadata{
 				EgressPacketCount: newu64(30),
 				EgressByteCount:   newu64(300),
 			},
 		},
-		test.ServerContainerID: {
-			ID:         test.ServerContainerID,
+		fixture.ServerContainerID: {
+			ID:         fixture.ServerContainerID,
 			LabelMajor: "server",
-			LabelMinor: test.ServerHostName,
-			Rank:       test.ServerContainerImageName,
+			LabelMinor: fixture.ServerHostName,
+			Rank:       fixture.ServerContainerImageName,
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.ServerContainerImageNodeID,
-				test.ServerContainerNodeID,
-				test.Server80NodeID,
-				test.ServerProcessNodeID,
-				test.ServerHostNodeID,
+				fixture.ServerContainerImageNodeID,
+				fixture.ServerContainerNodeID,
+				fixture.Server80NodeID,
+				fixture.ServerProcessNodeID,
+				fixture.ServerHostNodeID,
 			),
 			Node: report.MakeNode(),
 			EdgeMetadata: report.EdgeMetadata{
@@ -236,54 +236,54 @@ var (
 		uncontainedServerID: {
 			ID:         uncontainedServerID,
 			LabelMajor: render.UncontainedMajor,
-			LabelMinor: test.ServerHostName,
+			LabelMinor: fixture.ServerHostName,
 			Rank:       "",
 			Pseudo:     true,
 			Origins: report.MakeIDList(
-				test.NonContainerProcessNodeID,
-				test.ServerHostNodeID,
-				test.NonContainerNodeID,
+				fixture.NonContainerProcessNodeID,
+				fixture.ServerHostNodeID,
+				fixture.NonContainerNodeID,
 			),
 			Node:         report.MakeNode().WithAdjacent(render.TheInternetID),
 			EdgeMetadata: report.EdgeMetadata{},
 		},
-		render.TheInternetID: theInternetNode(test.ServerContainerID),
+		render.TheInternetID: theInternetNode(fixture.ServerContainerID),
 	}).Prune()
 
 	RenderedContainerImages = (render.RenderableNodes{
-		test.ClientContainerImageName: {
-			ID:         test.ClientContainerImageName,
-			LabelMajor: test.ClientContainerImageName,
+		fixture.ClientContainerImageName: {
+			ID:         fixture.ClientContainerImageName,
+			LabelMajor: fixture.ClientContainerImageName,
 			LabelMinor: "1 container",
-			Rank:       test.ClientContainerImageName,
+			Rank:       fixture.ClientContainerImageName,
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.ClientContainerImageNodeID,
-				test.ClientContainerNodeID,
-				test.Client54001NodeID,
-				test.Client54002NodeID,
-				test.ClientProcess1NodeID,
-				test.ClientProcess2NodeID,
-				test.ClientHostNodeID,
+				fixture.ClientContainerImageNodeID,
+				fixture.ClientContainerNodeID,
+				fixture.Client54001NodeID,
+				fixture.Client54002NodeID,
+				fixture.ClientProcess1NodeID,
+				fixture.ClientProcess2NodeID,
+				fixture.ClientHostNodeID,
 			),
-			Node: report.MakeNode().WithAdjacent(test.ServerContainerImageName),
+			Node: report.MakeNode().WithAdjacent(fixture.ServerContainerImageName),
 			EdgeMetadata: report.EdgeMetadata{
 				EgressPacketCount: newu64(30),
 				EgressByteCount:   newu64(300),
 			},
 		},
-		test.ServerContainerImageName: {
-			ID:         test.ServerContainerImageName,
-			LabelMajor: test.ServerContainerImageName,
+		fixture.ServerContainerImageName: {
+			ID:         fixture.ServerContainerImageName,
+			LabelMajor: fixture.ServerContainerImageName,
 			LabelMinor: "1 container",
-			Rank:       test.ServerContainerImageName,
+			Rank:       fixture.ServerContainerImageName,
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.ServerContainerImageNodeID,
-				test.ServerContainerNodeID,
-				test.Server80NodeID,
-				test.ServerProcessNodeID,
-				test.ServerHostNodeID),
+				fixture.ServerContainerImageNodeID,
+				fixture.ServerContainerNodeID,
+				fixture.Server80NodeID,
+				fixture.ServerProcessNodeID,
+				fixture.ServerHostNodeID),
 			Node: report.MakeNode(),
 			EdgeMetadata: report.EdgeMetadata{
 				IngressPacketCount: newu64(210),
@@ -293,24 +293,24 @@ var (
 		uncontainedServerID: {
 			ID:         uncontainedServerID,
 			LabelMajor: render.UncontainedMajor,
-			LabelMinor: test.ServerHostName,
+			LabelMinor: fixture.ServerHostName,
 			Rank:       "",
 			Pseudo:     true,
 			Origins: report.MakeIDList(
-				test.NonContainerNodeID,
-				test.NonContainerProcessNodeID,
-				test.ServerHostNodeID,
+				fixture.NonContainerNodeID,
+				fixture.NonContainerProcessNodeID,
+				fixture.ServerHostNodeID,
 			),
 			Node:         report.MakeNode().WithAdjacent(render.TheInternetID),
 			EdgeMetadata: report.EdgeMetadata{},
 		},
-		render.TheInternetID: theInternetNode(test.ServerContainerImageName),
+		render.TheInternetID: theInternetNode(fixture.ServerContainerImageName),
 	}).Prune()
 
-	ServerHostRenderedID = render.MakeHostID(test.ServerHostID)
-	ClientHostRenderedID = render.MakeHostID(test.ClientHostID)
-	pseudoHostID1        = render.MakePseudoNodeID(test.UnknownClient1IP, test.ServerIP)
-	pseudoHostID2        = render.MakePseudoNodeID(test.UnknownClient3IP, test.ServerIP)
+	ServerHostRenderedID = render.MakeHostID(fixture.ServerHostID)
+	ClientHostRenderedID = render.MakeHostID(fixture.ClientHostID)
+	pseudoHostID1        = render.MakePseudoNodeID(fixture.UnknownClient1IP, fixture.ServerIP)
+	pseudoHostID2        = render.MakePseudoNodeID(fixture.UnknownClient3IP, fixture.ServerIP)
 
 	RenderedHosts = (render.RenderableNodes{
 		ServerHostRenderedID: {
@@ -320,8 +320,8 @@ var (
 			Rank:       "hostname.com",
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.ServerHostNodeID,
-				test.ServerAddressNodeID,
+				fixture.ServerHostNodeID,
+				fixture.ServerAddressNodeID,
 			),
 			Node: report.MakeNode(),
 			EdgeMetadata: report.EdgeMetadata{
@@ -335,8 +335,8 @@ var (
 			Rank:       "hostname.com",
 			Pseudo:     false,
 			Origins: report.MakeIDList(
-				test.ClientHostNodeID,
-				test.ClientAddressNodeID,
+				fixture.ClientHostNodeID,
+				fixture.ClientAddressNodeID,
 			),
 			Node: report.MakeNode().WithAdjacent(ServerHostRenderedID),
 			EdgeMetadata: report.EdgeMetadata{
@@ -345,19 +345,19 @@ var (
 		},
 		pseudoHostID1: {
 			ID:           pseudoHostID1,
-			LabelMajor:   test.UnknownClient1IP,
+			LabelMajor:   fixture.UnknownClient1IP,
 			Pseudo:       true,
 			Node:         report.MakeNode().WithAdjacent(ServerHostRenderedID),
 			EdgeMetadata: report.EdgeMetadata{},
-			Origins:      report.MakeIDList(test.UnknownAddress1NodeID, test.UnknownAddress2NodeID),
+			Origins:      report.MakeIDList(fixture.UnknownAddress1NodeID, fixture.UnknownAddress2NodeID),
 		},
 		pseudoHostID2: {
 			ID:           pseudoHostID2,
-			LabelMajor:   test.UnknownClient3IP,
+			LabelMajor:   fixture.UnknownClient3IP,
 			Pseudo:       true,
 			Node:         report.MakeNode().WithAdjacent(ServerHostRenderedID),
 			EdgeMetadata: report.EdgeMetadata{},
-			Origins:      report.MakeIDList(test.UnknownAddress3NodeID),
+			Origins:      report.MakeIDList(fixture.UnknownAddress3NodeID),
 		},
 		render.TheInternetID: {
 			ID:           render.TheInternetID,
@@ -365,7 +365,7 @@ var (
 			Pseudo:       true,
 			Node:         report.MakeNode().WithAdjacent(ServerHostRenderedID),
 			EdgeMetadata: report.EdgeMetadata{},
-			Origins:      report.MakeIDList(test.RandomAddressNodeID),
+			Origins:      report.MakeIDList(fixture.RandomAddressNodeID),
 		},
 	}).Prune()
 

render/topologies_test.go

@@ -9,10 +9,11 @@ import (
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/render/expected"
 	"github.com/weaveworks/scope/test"
+	"github.com/weaveworks/scope/test/fixture"
 )
 
 func TestProcessRenderer(t *testing.T) {
-	have := render.ProcessRenderer.Render(test.Report).Prune()
+	have := render.ProcessRenderer.Render(fixture.Report).Prune()
 	want := expected.RenderedProcesses
 	if !reflect.DeepEqual(want, have) {
 		t.Error(test.Diff(want, have))
@@ -20,7 +21,7 @@ func TestProcessRenderer(t *testing.T) {
 }
 
 func TestProcessNameRenderer(t *testing.T) {
-	have := render.ProcessNameRenderer.Render(test.Report).Prune()
+	have := render.ProcessNameRenderer.Render(fixture.Report).Prune()
 	want := expected.RenderedProcessNames
 	if !reflect.DeepEqual(want, have) {
 		t.Error(test.Diff(want, have))
@@ -28,7 +29,7 @@ func TestProcessNameRenderer(t *testing.T) {
 }
 
 func TestContainerRenderer(t *testing.T) {
-	have := (render.ContainerWithImageNameRenderer.Render(test.Report)).Prune()
+	have := (render.ContainerWithImageNameRenderer.Render(fixture.Report)).Prune()
 	want := expected.RenderedContainers
 	if !reflect.DeepEqual(want, have) {
 		t.Error(test.Diff(want, have))
@@ -38,18 +39,18 @@ func TestContainerRenderer(t *testing.T) {
 func TestContainerFilterRenderer(t *testing.T) {
 	// tag on of the containers in the topology and ensure
 	// it is filtered out correctly.
-	input := test.Report.Copy()
-	input.Container.Nodes[test.ClientContainerNodeID].Metadata[docker.LabelPrefix+"works.weave.role"] = "system"
+	input := fixture.Report.Copy()
+	input.Container.Nodes[fixture.ClientContainerNodeID].Metadata[docker.LabelPrefix+"works.weave.role"] = "system"
 	have := render.FilterSystem(render.ContainerWithImageNameRenderer).Render(input).Prune()
 	want := expected.RenderedContainers.Copy()
-	delete(want, test.ClientContainerID)
+	delete(want, fixture.ClientContainerID)
 	if !reflect.DeepEqual(want, have) {
 		t.Error(test.Diff(want, have))
 	}
 }
 
 func TestContainerImageRenderer(t *testing.T) {
-	have := render.ContainerImageRenderer.Render(test.Report).Prune()
+	have := render.ContainerImageRenderer.Render(fixture.Report).Prune()
 	want := expected.RenderedContainerImages
 	if !reflect.DeepEqual(want, have) {
 		t.Error(test.Diff(want, have))
@@ -57,7 +58,7 @@ func TestContainerImageRenderer(t *testing.T) {
 }
 
 func TestHostRenderer(t *testing.T) {
-	have := render.HostRenderer.Render(test.Report).Prune()
+	have := render.HostRenderer.Render(fixture.Report).Prune()
 	want := expected.RenderedHosts
 	if !reflect.DeepEqual(want, have) {
 		t.Error(test.Diff(want, have))

test/fixture/report_fixture.go

@@ -1,4 +1,4 @@
-package test
+package fixture
 
 import (
 	"time"