Skip to content

K
k3s
Unverified Commit a2dbd456 authored by Jess Frazelle's avatar Jess Frazelle
Browse files
Options

cleanup all /tmp/kubelet_test files

Signed-off-by: 's avatarJess Frazelle <acidburn@google.com>
parent 91839402
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 0 deletions
pkg/kubelet/kubelet_cadvisor_test.go
View file @ a2dbd456
...@@ -36,6 +36,7 @@ func TestGetContainerInfo(t *testing.T) { ...@@ -36,6 +36,7 @@ func TestGetContainerInfo(t *testing.T) {
} }
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
fakeRuntime := testKubelet.fakeRuntime fakeRuntime := testKubelet.fakeRuntime
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
cadvisorReq := &cadvisorapi.ContainerInfoRequest{} cadvisorReq := &cadvisorapi.ContainerInfoRequest{}
...@@ -72,6 +73,7 @@ func TestGetRawContainerInfoRoot(t *testing.T) { ...@@ -72,6 +73,7 @@ func TestGetRawContainerInfoRoot(t *testing.T) {
}, },
} }
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
mockCadvisor := testKubelet.fakeCadvisor mockCadvisor := testKubelet.fakeCadvisor
cadvisorReq := &cadvisorapi.ContainerInfoRequest{} cadvisorReq := &cadvisorapi.ContainerInfoRequest{}
...@@ -99,6 +101,7 @@ func TestGetRawContainerInfoSubcontainers(t *testing.T) { ...@@ -99,6 +101,7 @@ func TestGetRawContainerInfoSubcontainers(t *testing.T) {
}, },
} }
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
mockCadvisor := testKubelet.fakeCadvisor mockCadvisor := testKubelet.fakeCadvisor
cadvisorReq := &cadvisorapi.ContainerInfoRequest{} cadvisorReq := &cadvisorapi.ContainerInfoRequest{}
...@@ -117,6 +120,7 @@ func TestGetRawContainerInfoSubcontainers(t *testing.T) { ...@@ -117,6 +120,7 @@ func TestGetRawContainerInfoSubcontainers(t *testing.T) {
func TestGetContainerInfoWhenCadvisorFailed(t *testing.T) { func TestGetContainerInfoWhenCadvisorFailed(t *testing.T) {
containerID := "ab2cdf" containerID := "ab2cdf"
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
mockCadvisor := testKubelet.fakeCadvisor mockCadvisor := testKubelet.fakeCadvisor
fakeRuntime := testKubelet.fakeRuntime fakeRuntime := testKubelet.fakeRuntime
...@@ -152,6 +156,7 @@ func TestGetContainerInfoWhenCadvisorFailed(t *testing.T) { ...@@ -152,6 +156,7 @@ func TestGetContainerInfoWhenCadvisorFailed(t *testing.T) {
func TestGetContainerInfoOnNonExistContainer(t *testing.T) { func TestGetContainerInfoOnNonExistContainer(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
mockCadvisor := testKubelet.fakeCadvisor mockCadvisor := testKubelet.fakeCadvisor
fakeRuntime := testKubelet.fakeRuntime fakeRuntime := testKubelet.fakeRuntime
...@@ -166,6 +171,7 @@ func TestGetContainerInfoOnNonExistContainer(t *testing.T) { ...@@ -166,6 +171,7 @@ func TestGetContainerInfoOnNonExistContainer(t *testing.T) {
func TestGetContainerInfoWhenContainerRuntimeFailed(t *testing.T) { func TestGetContainerInfoWhenContainerRuntimeFailed(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
mockCadvisor := testKubelet.fakeCadvisor mockCadvisor := testKubelet.fakeCadvisor
fakeRuntime := testKubelet.fakeRuntime fakeRuntime := testKubelet.fakeRuntime
...@@ -187,6 +193,7 @@ func TestGetContainerInfoWhenContainerRuntimeFailed(t *testing.T) { ...@@ -187,6 +193,7 @@ func TestGetContainerInfoWhenContainerRuntimeFailed(t *testing.T) {
func TestGetContainerInfoWithNoContainers(t *testing.T) { func TestGetContainerInfoWithNoContainers(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
mockCadvisor := testKubelet.fakeCadvisor mockCadvisor := testKubelet.fakeCadvisor
...@@ -205,6 +212,7 @@ func TestGetContainerInfoWithNoContainers(t *testing.T) { ...@@ -205,6 +212,7 @@ func TestGetContainerInfoWithNoContainers(t *testing.T) {
func TestGetContainerInfoWithNoMatchingContainers(t *testing.T) { func TestGetContainerInfoWithNoMatchingContainers(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
fakeRuntime := testKubelet.fakeRuntime fakeRuntime := testKubelet.fakeRuntime
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
mockCadvisor := testKubelet.fakeCadvisor mockCadvisor := testKubelet.fakeCadvisor
...@@ -253,6 +261,7 @@ func TestHasDedicatedImageFs(t *testing.T) { ...@@ -253,6 +261,7 @@ func TestHasDedicatedImageFs(t *testing.T) {
} }
for testName, testCase := range testCases { for testName, testCase := range testCases {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
mockCadvisor := testKubelet.fakeCadvisor mockCadvisor := testKubelet.fakeCadvisor
mockCadvisor.On("Start").Return(nil) mockCadvisor.On("Start").Return(nil)
......
pkg/kubelet/kubelet_getters_test.go
View file @ a2dbd456
...@@ -25,6 +25,7 @@ import ( ...@@ -25,6 +25,7 @@ import (
func TestKubeletDirs(t *testing.T) { func TestKubeletDirs(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
root := kubelet.rootDirectory root := kubelet.rootDirectory
...@@ -87,6 +88,7 @@ func TestKubeletDirs(t *testing.T) { ...@@ -87,6 +88,7 @@ func TestKubeletDirs(t *testing.T) {
func TestKubeletDirsCompat(t *testing.T) { func TestKubeletDirsCompat(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
root := kubelet.rootDirectory root := kubelet.rootDirectory
if err := os.MkdirAll(root, 0750); err != nil { if err := os.MkdirAll(root, 0750); err != nil {
......
pkg/kubelet/kubelet_network_test.go
View file @ a2dbd456
...@@ -28,6 +28,7 @@ import ( ...@@ -28,6 +28,7 @@ import (
func TestNodeIPParam(t *testing.T) { func TestNodeIPParam(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
tests := []struct { tests := []struct {
nodeIP string nodeIP string
...@@ -96,6 +97,7 @@ func TestParseResolvConf(t *testing.T) { ...@@ -96,6 +97,7 @@ func TestParseResolvConf(t *testing.T) {
{"#comment\nnameserver 1.2.3.4\n#comment\nsearch foo\ncomment", []string{"1.2.3.4"}, []string{"foo"}}, {"#comment\nnameserver 1.2.3.4\n#comment\nsearch foo\ncomment", []string{"1.2.3.4"}, []string{"foo"}},
} }
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
for i, tc := range testCases { for i, tc := range testCases {
ns, srch, err := kubelet.parseResolvConf(strings.NewReader(tc.data)) ns, srch, err := kubelet.parseResolvConf(strings.NewReader(tc.data))
...@@ -178,6 +180,7 @@ func TestCleanupBandwidthLimits(t *testing.T) { ...@@ -178,6 +180,7 @@ func TestCleanupBandwidthLimits(t *testing.T) {
} }
testKube := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKube := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKube.Cleanup()
testKube.kubelet.shaper = shaper testKube.kubelet.shaper = shaper
for _, pod := range test.pods { for _, pod := range test.pods {
......
pkg/kubelet/kubelet_node_status_test.go
View file @ a2dbd456
...@@ -114,6 +114,7 @@ func TestUpdateNewNodeStatus(t *testing.T) { ...@@ -114,6 +114,7 @@ func TestUpdateNewNodeStatus(t *testing.T) {
inputImageList, expectedImageList := generateTestingImageList(maxImagesInNodeStatus + 1) inputImageList, expectedImageList := generateTestingImageList(maxImagesInNodeStatus + 1)
testKubelet := newTestKubeletWithImageList( testKubelet := newTestKubeletWithImageList(
t, inputImageList, false /* controllerAttachDetachEnabled */) t, inputImageList, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
kubeClient := testKubelet.fakeKubeClient kubeClient := testKubelet.fakeKubeClient
existingNode := v1.Node{ObjectMeta: v1.ObjectMeta{Name: testKubeletHostname}} existingNode := v1.Node{ObjectMeta: v1.ObjectMeta{Name: testKubeletHostname}}
...@@ -253,6 +254,7 @@ func TestUpdateNewNodeStatus(t *testing.T) { ...@@ -253,6 +254,7 @@ func TestUpdateNewNodeStatus(t *testing.T) {
func TestUpdateNewNodeOutOfDiskStatusWithTransitionFrequency(t *testing.T) { func TestUpdateNewNodeOutOfDiskStatusWithTransitionFrequency(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
kubeClient := testKubelet.fakeKubeClient kubeClient := testKubelet.fakeKubeClient
existingNode := v1.Node{ObjectMeta: v1.ObjectMeta{Name: testKubeletHostname}} existingNode := v1.Node{ObjectMeta: v1.ObjectMeta{Name: testKubeletHostname}}
...@@ -328,6 +330,7 @@ func TestUpdateNewNodeOutOfDiskStatusWithTransitionFrequency(t *testing.T) { ...@@ -328,6 +330,7 @@ func TestUpdateNewNodeOutOfDiskStatusWithTransitionFrequency(t *testing.T) {
func TestUpdateExistingNodeStatus(t *testing.T) { func TestUpdateExistingNodeStatus(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
kubeClient := testKubelet.fakeKubeClient kubeClient := testKubelet.fakeKubeClient
existingNode := v1.Node{ existingNode := v1.Node{
...@@ -523,6 +526,7 @@ func TestUpdateExistingNodeStatus(t *testing.T) { ...@@ -523,6 +526,7 @@ func TestUpdateExistingNodeStatus(t *testing.T) {
func TestUpdateExistingNodeOutOfDiskStatusWithTransitionFrequency(t *testing.T) { func TestUpdateExistingNodeOutOfDiskStatusWithTransitionFrequency(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
clock := testKubelet.fakeClock clock := testKubelet.fakeClock
// Do not set nano second, because apiserver function doesn't support nano second. (Only support // Do not set nano second, because apiserver function doesn't support nano second. (Only support
...@@ -681,6 +685,7 @@ func TestUpdateExistingNodeOutOfDiskStatusWithTransitionFrequency(t *testing.T) ...@@ -681,6 +685,7 @@ func TestUpdateExistingNodeOutOfDiskStatusWithTransitionFrequency(t *testing.T)
func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) { func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
clock := testKubelet.fakeClock clock := testKubelet.fakeClock
kubeClient := testKubelet.fakeKubeClient kubeClient := testKubelet.fakeKubeClient
...@@ -900,6 +905,7 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) { ...@@ -900,6 +905,7 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) {
func TestUpdateNodeStatusError(t *testing.T) { func TestUpdateNodeStatusError(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
// No matching node for the kubelet // No matching node for the kubelet
testKubelet.fakeKubeClient.ReactionChain = fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{}}).ReactionChain testKubelet.fakeKubeClient.ReactionChain = fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{}}).ReactionChain
...@@ -914,6 +920,7 @@ func TestUpdateNodeStatusError(t *testing.T) { ...@@ -914,6 +920,7 @@ func TestUpdateNodeStatusError(t *testing.T) {
func TestRegisterWithApiServer(t *testing.T) { func TestRegisterWithApiServer(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
kubeClient := testKubelet.fakeKubeClient kubeClient := testKubelet.fakeKubeClient
kubeClient.AddReactor("create", "nodes", func(action core.Action) (bool, runtime.Object, error) { kubeClient.AddReactor("create", "nodes", func(action core.Action) (bool, runtime.Object, error) {
...@@ -1094,6 +1101,7 @@ func TestTryRegisterWithApiServer(t *testing.T) { ...@@ -1094,6 +1101,7 @@ func TestTryRegisterWithApiServer(t *testing.T) {
for _, tc := range cases { for _, tc := range cases {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled is a don't-care for this test */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled is a don't-care for this test */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
kubeClient := testKubelet.fakeKubeClient kubeClient := testKubelet.fakeKubeClient
......
pkg/kubelet/kubelet_pods_test.go
View file @ a2dbd456
...@@ -113,6 +113,7 @@ func TestMakeMounts(t *testing.T) { ...@@ -113,6 +113,7 @@ func TestMakeMounts(t *testing.T) {
func TestRunInContainerNoSuchPod(t *testing.T) { func TestRunInContainerNoSuchPod(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
fakeRuntime := testKubelet.fakeRuntime fakeRuntime := testKubelet.fakeRuntime
fakeRuntime.PodList = []*containertest.FakePod{} fakeRuntime.PodList = []*containertest.FakePod{}
...@@ -132,6 +133,7 @@ func TestRunInContainerNoSuchPod(t *testing.T) { ...@@ -132,6 +133,7 @@ func TestRunInContainerNoSuchPod(t *testing.T) {
func TestRunInContainer(t *testing.T) { func TestRunInContainer(t *testing.T) {
for _, testError := range []error{nil, errors.New("bar")} { for _, testError := range []error{nil, errors.New("bar")} {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
fakeRuntime := testKubelet.fakeRuntime fakeRuntime := testKubelet.fakeRuntime
fakeCommandRunner := containertest.FakeContainerCommandRunner{ fakeCommandRunner := containertest.FakeContainerCommandRunner{
...@@ -165,6 +167,7 @@ func TestRunInContainer(t *testing.T) { ...@@ -165,6 +167,7 @@ func TestRunInContainer(t *testing.T) {
func TestGenerateRunContainerOptions_DNSConfigurationParams(t *testing.T) { func TestGenerateRunContainerOptions_DNSConfigurationParams(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
clusterNS := "203.0.113.1" clusterNS := "203.0.113.1"
...@@ -737,6 +740,7 @@ func TestMakeEnvironmentVariables(t *testing.T) { ...@@ -737,6 +740,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
for _, tc := range testCases { for _, tc := range testCases {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kl := testKubelet.kubelet kl := testKubelet.kubelet
kl.masterServiceNamespace = tc.masterServiceNs kl.masterServiceNamespace = tc.masterServiceNs
if tc.nilLister { if tc.nilLister {
...@@ -1202,6 +1206,7 @@ func TestExec(t *testing.T) { ...@@ -1202,6 +1206,7 @@ func TestExec(t *testing.T) {
for _, tc := range testcases { for _, tc := range testcases {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
testKubelet.fakeRuntime.PodList = []*containertest.FakePod{ testKubelet.fakeRuntime.PodList = []*containertest.FakePod{
{Pod: &kubecontainer.Pod{ {Pod: &kubecontainer.Pod{
...@@ -1292,6 +1297,7 @@ func TestPortForward(t *testing.T) { ...@@ -1292,6 +1297,7 @@ func TestPortForward(t *testing.T) {
for _, tc := range testcases { for _, tc := range testcases {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
testKubelet.fakeRuntime.PodList = []*containertest.FakePod{ testKubelet.fakeRuntime.PodList = []*containertest.FakePod{
{Pod: &kubecontainer.Pod{ {Pod: &kubecontainer.Pod{
...@@ -1439,6 +1445,7 @@ func TestHasHostMountPVC(t *testing.T) { ...@@ -1439,6 +1445,7 @@ func TestHasHostMountPVC(t *testing.T) {
for k, v := range tests { for k, v := range tests {
testKubelet := newTestKubelet(t, false) testKubelet := newTestKubelet(t, false)
defer testKubelet.Cleanup()
pod := &v1.Pod{ pod := &v1.Pod{
Spec: v1.PodSpec{}, Spec: v1.PodSpec{},
} }
......
pkg/kubelet/kubelet_resources_test.go
View file @ a2dbd456
...@@ -33,6 +33,7 @@ func TestPodResourceLimitsDefaulting(t *testing.T) { ...@@ -33,6 +33,7 @@ func TestPodResourceLimitsDefaulting(t *testing.T) {
cpuCores := resource.MustParse("10") cpuCores := resource.MustParse("10")
memoryCapacity := resource.MustParse("10Gi") memoryCapacity := resource.MustParse("10Gi")
tk := newTestKubelet(t, true) tk := newTestKubelet(t, true)
defer tk.Cleanup()
tk.fakeCadvisor.On("VersionInfo").Return(&cadvisorapi.VersionInfo{}, nil) tk.fakeCadvisor.On("VersionInfo").Return(&cadvisorapi.VersionInfo{}, nil)
tk.fakeCadvisor.On("MachineInfo").Return(&cadvisorapi.MachineInfo{ tk.fakeCadvisor.On("MachineInfo").Return(&cadvisorapi.MachineInfo{
NumCores: int(cpuCores.Value()), NumCores: int(cpuCores.Value()),
......
pkg/kubelet/kubelet_volumes_test.go
View file @ a2dbd456
...@@ -85,6 +85,7 @@ func TestListVolumesForPod(t *testing.T) { ...@@ -85,6 +85,7 @@ func TestListVolumesForPod(t *testing.T) {
func TestPodVolumesExist(t *testing.T) { func TestPodVolumesExist(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
pods := []*v1.Pod{ pods := []*v1.Pod{
...@@ -169,6 +170,7 @@ func TestPodVolumesExist(t *testing.T) { ...@@ -169,6 +170,7 @@ func TestPodVolumesExist(t *testing.T) {
func TestVolumeAttachAndMountControllerDisabled(t *testing.T) { func TestVolumeAttachAndMountControllerDisabled(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
pod := podWithUidNameNsSpec("12345678", "foo", "test", v1.PodSpec{ pod := podWithUidNameNsSpec("12345678", "foo", "test", v1.PodSpec{
...@@ -214,6 +216,7 @@ func TestVolumeAttachAndMountControllerDisabled(t *testing.T) { ...@@ -214,6 +216,7 @@ func TestVolumeAttachAndMountControllerDisabled(t *testing.T) {
func TestVolumeUnmountAndDetachControllerDisabled(t *testing.T) { func TestVolumeUnmountAndDetachControllerDisabled(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
pod := podWithUidNameNsSpec("12345678", "foo", "test", v1.PodSpec{ pod := podWithUidNameNsSpec("12345678", "foo", "test", v1.PodSpec{
...@@ -284,6 +287,7 @@ func TestVolumeUnmountAndDetachControllerDisabled(t *testing.T) { ...@@ -284,6 +287,7 @@ func TestVolumeUnmountAndDetachControllerDisabled(t *testing.T) {
func TestVolumeAttachAndMountControllerEnabled(t *testing.T) { func TestVolumeAttachAndMountControllerEnabled(t *testing.T) {
testKubelet := newTestKubelet(t, true /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, true /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
kubeClient := testKubelet.fakeKubeClient kubeClient := testKubelet.fakeKubeClient
kubeClient.AddReactor("get", "nodes", kubeClient.AddReactor("get", "nodes",
...@@ -352,6 +356,7 @@ func TestVolumeAttachAndMountControllerEnabled(t *testing.T) { ...@@ -352,6 +356,7 @@ func TestVolumeAttachAndMountControllerEnabled(t *testing.T) {
func TestVolumeUnmountAndDetachControllerEnabled(t *testing.T) { func TestVolumeUnmountAndDetachControllerEnabled(t *testing.T) {
testKubelet := newTestKubelet(t, true /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, true /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
kubeClient := testKubelet.fakeKubeClient kubeClient := testKubelet.fakeKubeClient
kubeClient.AddReactor("get", "nodes", kubeClient.AddReactor("get", "nodes",
......
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