Fix pkg/kubelet unit tests fail on OSX

Fixes #27730
This commit is contained in:
Davanum Srinivas 2016-06-20 21:54:23 -04:00
parent e93608c859
commit 8beed4cd8d
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59

View File

@ -25,6 +25,7 @@ import (
"net/http" "net/http"
"os" "os"
"reflect" "reflect"
goruntime "runtime"
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
@ -2763,8 +2764,8 @@ func TestUpdateNewNodeStatus(t *testing.T) {
BootID: "1b3", BootID: "1b3",
KernelVersion: "3.16.0-0.bpo.4-amd64", KernelVersion: "3.16.0-0.bpo.4-amd64",
OSImage: "Debian GNU/Linux 7 (wheezy)", OSImage: "Debian GNU/Linux 7 (wheezy)",
OperatingSystem: "linux", OperatingSystem: goruntime.GOOS,
Architecture: "amd64", Architecture: goruntime.GOARCH,
ContainerRuntimeVersion: "test://1.5.0", ContainerRuntimeVersion: "test://1.5.0",
KubeletVersion: version.Get().String(), KubeletVersion: version.Get().String(),
KubeProxyVersion: version.Get().String(), KubeProxyVersion: version.Get().String(),
@ -3010,8 +3011,8 @@ func TestUpdateExistingNodeStatus(t *testing.T) {
BootID: "1b3", BootID: "1b3",
KernelVersion: "3.16.0-0.bpo.4-amd64", KernelVersion: "3.16.0-0.bpo.4-amd64",
OSImage: "Debian GNU/Linux 7 (wheezy)", OSImage: "Debian GNU/Linux 7 (wheezy)",
OperatingSystem: "linux", OperatingSystem: goruntime.GOOS,
Architecture: "amd64", Architecture: goruntime.GOARCH,
ContainerRuntimeVersion: "test://1.5.0", ContainerRuntimeVersion: "test://1.5.0",
KubeletVersion: version.Get().String(), KubeletVersion: version.Get().String(),
KubeProxyVersion: version.Get().String(), KubeProxyVersion: version.Get().String(),
@ -3294,8 +3295,8 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) {
BootID: "1b3", BootID: "1b3",
KernelVersion: "3.16.0-0.bpo.4-amd64", KernelVersion: "3.16.0-0.bpo.4-amd64",
OSImage: "Debian GNU/Linux 7 (wheezy)", OSImage: "Debian GNU/Linux 7 (wheezy)",
OperatingSystem: "linux", OperatingSystem: goruntime.GOOS,
Architecture: "amd64", Architecture: goruntime.GOARCH,
ContainerRuntimeVersion: "test://1.5.0", ContainerRuntimeVersion: "test://1.5.0",
KubeletVersion: version.Get().String(), KubeletVersion: version.Get().String(),
KubeProxyVersion: version.Get().String(), KubeProxyVersion: version.Get().String(),