Unbreak the build

This commit is contained in:
Peter Bourgon
2015-07-22 14:26:09 +01:00
parent 05c3b87aba
commit a565acc871
2 changed files with 15 additions and 10 deletions

View File

@@ -40,9 +40,9 @@ var (
RenderedProcesses = render.RenderableNodes{
ClientProcess1ID: {
ID: ClientProcess1ID,
LabelMajor: "curl",
LabelMajor: test.Client1Comm,
LabelMinor: fmt.Sprintf("%s (%s)", test.ClientHostID, test.Client1PID),
Rank: test.Client1PID,
Rank: test.Client1Comm,
Pseudo: false,
Adjacency: report.MakeIDList(ServerProcessID),
Origins: report.MakeIDList(
@@ -57,9 +57,9 @@ var (
},
ClientProcess2ID: {
ID: ClientProcess2ID,
LabelMajor: "curl",
LabelMajor: test.Client2Comm,
LabelMinor: fmt.Sprintf("%s (%s)", test.ClientHostID, test.Client2PID),
Rank: test.Client2PID,
Rank: test.Client2Comm,
Pseudo: false,
Adjacency: report.MakeIDList(ServerProcessID),
Origins: report.MakeIDList(
@@ -76,7 +76,7 @@ var (
ID: ServerProcessID,
LabelMajor: "apache",
LabelMinor: fmt.Sprintf("%s (%s)", test.ServerHostID, test.ServerPID),
Rank: test.ServerPID,
Rank: test.ServerComm,
Pseudo: false,
Adjacency: report.MakeIDList(
ClientProcess1ID,
@@ -99,7 +99,7 @@ var (
ID: nonContainerProcessID,
LabelMajor: "bash",
LabelMinor: fmt.Sprintf("%s (%s)", test.ServerHostID, test.NonContainerPID),
Rank: test.NonContainerPID,
Rank: test.NonContainerComm,
Pseudo: false,
Adjacency: report.MakeIDList(),
Origins: report.MakeIDList(

View File

@@ -33,6 +33,11 @@ var (
ServerPID = "215"
NonContainerPID = "1234"
Client1Comm = "curl"
Client2Comm = "curl"
ServerComm = "apache"
NonContainerComm = "bash"
ClientHostNodeID = report.MakeHostNodeID(ClientHostID)
ServerHostNodeID = report.MakeHostNodeID(ServerHostID)
@@ -143,25 +148,25 @@ var (
NodeMetadatas: report.NodeMetadatas{
ClientProcess1NodeID: report.NewNodeMetadata(map[string]string{
"pid": Client1PID,
"comm": "curl",
"comm": Client1Comm,
docker.ContainerID: ClientContainerID,
report.HostNodeID: ClientHostNodeID,
}),
ClientProcess2NodeID: report.NewNodeMetadata(map[string]string{
"pid": Client2PID,
"comm": "curl",
"comm": Client2Comm,
docker.ContainerID: ClientContainerID,
report.HostNodeID: ClientHostNodeID,
}),
ServerProcessNodeID: report.NewNodeMetadata(map[string]string{
"pid": ServerPID,
"comm": "apache",
"comm": ServerComm,
docker.ContainerID: ServerContainerID,
report.HostNodeID: ServerHostNodeID,
}),
NonContainerProcessNodeID: report.NewNodeMetadata(map[string]string{
"pid": NonContainerPID,
"comm": "bash",
"comm": NonContainerComm,
report.HostNodeID: ServerHostNodeID,
}),
},