From ab3927617d097e8d94ee306f9811c4c2eb5dc8e7 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Fri, 13 Nov 2015 12:02:26 +0000
Subject: [PATCH] Update tests

---
 probe/docker/container_test.go |  4 ++--
 probe/docker/registry_test.go  |  8 ++++++--
 probe/docker/reporter_test.go  |  2 +-
 probe/docker/tagger_test.go    | 14 +++++++-------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/probe/docker/container_test.go b/probe/docker/container_test.go
index 7add75481..ef74aa7b9 100644
--- a/probe/docker/container_test.go
+++ b/probe/docker/container_test.go
@@ -105,8 +105,8 @@ func TestContainer(t *testing.T) {
 	if c.Image() != "baz" {
 		t.Errorf("%s != baz", c.Image())
 	}
-	if c.PID() != 1 {
-		t.Errorf("%d != 1", c.PID())
+	if c.PID() != 2 {
+		t.Errorf("%d != 2", c.PID())
 	}
 	if have := docker.ExtractContainerIPs(c.GetNode("", []net.IP{})); !reflect.DeepEqual(have, []string{"1.2.3.4"}) {
 		t.Errorf("%v != %v", have, []string{"1.2.3.4"})
diff --git a/probe/docker/registry_test.go b/probe/docker/registry_test.go
index 6361298fd..63456dba3 100644
--- a/probe/docker/registry_test.go
+++ b/probe/docker/registry_test.go
@@ -38,6 +38,10 @@ func (c *mockContainer) Hostname() string {
 	return ""
 }
 
+func (c *mockContainer) State() string {
+	return docker.StateRunning
+}
+
 func (c *mockContainer) StartGatheringStats() error {
 	return nil
 }
@@ -133,7 +137,7 @@ var (
 		ID:    "ping",
 		Name:  "pong",
 		Image: "baz",
-		State: client.State{Pid: 1, Running: true},
+		State: client.State{Pid: 2, Running: true},
 		NetworkSettings: &client.NetworkSettings{
 			IPAddress: "1.2.3.4",
 			Ports: map[client.Port][]client.PortBinding{
@@ -249,7 +253,7 @@ func TestLookupByPID(t *testing.T) {
 		test.Poll(t, 100*time.Millisecond, want, func() interface{} {
 			var have docker.Container
 			registry.LockedPIDLookup(func(lookup func(int) docker.Container) {
-				have = lookup(1)
+				have = lookup(2)
 			})
 			return have
 		})
diff --git a/probe/docker/reporter_test.go b/probe/docker/reporter_test.go
index 598773b69..ac35717ea 100644
--- a/probe/docker/reporter_test.go
+++ b/probe/docker/reporter_test.go
@@ -41,7 +41,7 @@ func (r *mockRegistry) WatchContainerUpdates(_ docker.ContainerUpdateWatcher) {}
 var (
 	mockRegistryInstance = &mockRegistry{
 		containersByPID: map[int]docker.Container{
-			1: &mockContainer{container1},
+			2: &mockContainer{container1},
 		},
 		images: map[string]*client.APIImages{
 			"baz": &apiImage1,
diff --git a/probe/docker/tagger_test.go b/probe/docker/tagger_test.go
index ef6b7eeea..f1811f6d4 100644
--- a/probe/docker/tagger_test.go
+++ b/probe/docker/tagger_test.go
@@ -28,22 +28,22 @@ func TestTagger(t *testing.T) {
 	defer func() { docker.NewProcessTreeStub = oldProcessTree }()
 
 	docker.NewProcessTreeStub = func(_ process.Walker) (process.Tree, error) {
-		return &mockProcessTree{map[int]int{2: 1}}, nil
+		return &mockProcessTree{map[int]int{3: 2}}, nil
 	}
 
 	var (
-		pid1NodeID = report.MakeProcessNodeID("somehost.com", "1")
-		pid2NodeID = report.MakeProcessNodeID("somehost.com", "2")
+		pid1NodeID = report.MakeProcessNodeID("somehost.com", "2")
+		pid2NodeID = report.MakeProcessNodeID("somehost.com", "3")
 		wantNode   = report.MakeNodeWith(map[string]string{docker.ContainerID: "ping"})
 	)
 
 	input := report.MakeReport()
-	input.Process.AddNode(pid1NodeID, report.MakeNodeWith(map[string]string{"pid": "1"}))
-	input.Process.AddNode(pid2NodeID, report.MakeNodeWith(map[string]string{"pid": "2"}))
+	input.Process.AddNode(pid1NodeID, report.MakeNodeWith(map[string]string{process.PID: "2"}))
+	input.Process.AddNode(pid2NodeID, report.MakeNodeWith(map[string]string{process.PID: "3"}))
 
 	want := report.MakeReport()
-	want.Process.AddNode(pid1NodeID, report.MakeNodeWith(map[string]string{"pid": "1"}).Merge(wantNode))
-	want.Process.AddNode(pid2NodeID, report.MakeNodeWith(map[string]string{"pid": "2"}).Merge(wantNode))
+	want.Process.AddNode(pid1NodeID, report.MakeNodeWith(map[string]string{process.PID: "2"}).Merge(wantNode))
+	want.Process.AddNode(pid2NodeID, report.MakeNodeWith(map[string]string{process.PID: "3"}).Merge(wantNode))
 
 	tagger := docker.NewTagger(mockRegistryInstance, nil)
 	have, err := tagger.Tag(input)