Merge pull request #6653 from yifan-gu/fix_pid_test

kubelet/fake_docker_client: Use self's PID instead of 42 in testing.

Merge pull request #6653 from yifan-gu/fix_pid_test
f16abee1 · Daniel Smith · 629d9465 · 12b382ce · f16abee1
Commit f16abee1 authored Apr 09, 2015 by Daniel Smith
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

fake_docker_client.go pkg/kubelet/dockertools/fake_docker_client.go +2 -1

No files found.
--- a/pkg/kubelet/dockertools/fake_docker_client.go
+++ b/pkg/kubelet/dockertools/fake_docker_client.go
@@ -18,6 +18,7 @@ package dockertools

 import (
 	"fmt"
+	"os"
 	"reflect"
 	"sort"
 	"sync"
@@ -180,7 +181,7 @@ func (f *FakeDockerClient) StartContainer(id string, hostConfig *docker.HostConf
 		HostConfig: hostConfig,
 		State: docker.State{
 			Running: true,
-			Pid:     42,
+			Pid:     os.Getpid(),
 		},
 		NetworkSettings: &docker.NetworkSettings{IPAddress: "1.2.3.4"},
 	}