From 8beed4cd8d34b4b28b68750b819c92b0d72db19e Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 20 Jun 2016 21:54:23 -0400 Subject: [PATCH] Fix pkg/kubelet unit tests fail on OSX Fixes #27730 --- pkg/kubelet/kubelet_test.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index bbbcf20ec71..a1202a32919 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -25,6 +25,7 @@ import ( "net/http" "os" "reflect" + goruntime "runtime" "sort" "strconv" "strings" @@ -2763,8 +2764,8 @@ func TestUpdateNewNodeStatus(t *testing.T) { BootID: "1b3", KernelVersion: "3.16.0-0.bpo.4-amd64", OSImage: "Debian GNU/Linux 7 (wheezy)", - OperatingSystem: "linux", - Architecture: "amd64", + OperatingSystem: goruntime.GOOS, + Architecture: goruntime.GOARCH, ContainerRuntimeVersion: "test://1.5.0", KubeletVersion: version.Get().String(), KubeProxyVersion: version.Get().String(), @@ -3010,8 +3011,8 @@ func TestUpdateExistingNodeStatus(t *testing.T) { BootID: "1b3", KernelVersion: "3.16.0-0.bpo.4-amd64", OSImage: "Debian GNU/Linux 7 (wheezy)", - OperatingSystem: "linux", - Architecture: "amd64", + OperatingSystem: goruntime.GOOS, + Architecture: goruntime.GOARCH, ContainerRuntimeVersion: "test://1.5.0", KubeletVersion: version.Get().String(), KubeProxyVersion: version.Get().String(), @@ -3294,8 +3295,8 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) { BootID: "1b3", KernelVersion: "3.16.0-0.bpo.4-amd64", OSImage: "Debian GNU/Linux 7 (wheezy)", - OperatingSystem: "linux", - Architecture: "amd64", + OperatingSystem: goruntime.GOOS, + Architecture: goruntime.GOARCH, ContainerRuntimeVersion: "test://1.5.0", KubeletVersion: version.Get().String(), KubeProxyVersion: version.Get().String(),