Commit 376b45cb authored by Pengfei Ni's avatar Pengfei Ni

Fix unit tests for Windows

* TestMakeBlockVolume is moved to Linux only. * TestMakeMounts are running on both Linux and Windows
parent aeea9671
...@@ -155,6 +155,7 @@ go_test( ...@@ -155,6 +155,7 @@ go_test(
"kubelet_getters_test.go", "kubelet_getters_test.go",
"kubelet_network_test.go", "kubelet_network_test.go",
"kubelet_node_status_test.go", "kubelet_node_status_test.go",
"kubelet_pods_linux_test.go",
"kubelet_pods_test.go", "kubelet_pods_test.go",
"kubelet_pods_windows_test.go", "kubelet_pods_windows_test.go",
"kubelet_resources_test.go", "kubelet_resources_test.go",
...@@ -172,7 +173,6 @@ go_test( ...@@ -172,7 +173,6 @@ go_test(
"//pkg/capabilities:go_default_library", "//pkg/capabilities:go_default_library",
"//pkg/features:go_default_library", "//pkg/features:go_default_library",
"//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/apis:go_default_library",
"//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
"//pkg/kubelet/cadvisor/testing:go_default_library", "//pkg/kubelet/cadvisor/testing:go_default_library",
"//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/cm:go_default_library",
"//pkg/kubelet/config:go_default_library", "//pkg/kubelet/config:go_default_library",
...@@ -242,7 +242,12 @@ go_test( ...@@ -242,7 +242,12 @@ go_test(
"//vendor/github.com/google/cadvisor/info/v2:go_default_library", "//vendor/github.com/google/cadvisor/info/v2:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/github.com/stretchr/testify/require:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library",
], ] + select({
"@io_bazel_rules_go//go/platform:linux": [
"//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
],
"//conditions:default": [],
}),
) )
filegroup( filegroup(
......
...@@ -180,7 +180,7 @@ func newTestKubeletWithImageList( ...@@ -180,7 +180,7 @@ func newTestKubeletWithImageList(
kubelet.nodeName = types.NodeName(testKubeletHostname) kubelet.nodeName = types.NodeName(testKubeletHostname)
kubelet.runtimeState = newRuntimeState(maxWaitForContainerRuntime) kubelet.runtimeState = newRuntimeState(maxWaitForContainerRuntime)
kubelet.runtimeState.setNetworkState(nil) kubelet.runtimeState.setNetworkState(nil)
if tempDir, err := ioutil.TempDir("/tmp", "kubelet_test."); err != nil { if tempDir, err := ioutil.TempDir("", "kubelet_test."); err != nil {
t.Fatalf("can't make a temp rootdir: %v", err) t.Fatalf("can't make a temp rootdir: %v", err)
} else { } else {
kubelet.rootDirectory = tempDir kubelet.rootDirectory = tempDir
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment