From 4357551ae3931a9ae488e691f3f6b0119ebbcae6 Mon Sep 17 00:00:00 2001 From: ynqa Date: Thu, 6 Aug 2020 01:42:23 +0900 Subject: [PATCH 1/2] add testcases for kubelet getters --- pkg/kubelet/kubelet_getters_test.go | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/pkg/kubelet/kubelet_getters_test.go b/pkg/kubelet/kubelet_getters_test.go index 8eb04e36af2..8148ad179a5 100644 --- a/pkg/kubelet/kubelet_getters_test.go +++ b/pkg/kubelet/kubelet_getters_test.go @@ -21,6 +21,8 @@ import ( "testing" "github.com/stretchr/testify/assert" + + "k8s.io/kubernetes/pkg/kubelet/cm" ) func TestKubeletDirs(t *testing.T) { @@ -39,6 +41,10 @@ func TestKubeletDirs(t *testing.T) { exp = filepath.Join(root, "plugins") assert.Equal(t, exp, got) + got = kubelet.getPluginsRegistrationDir() + exp = filepath.Join(root, "plugins_registry") + assert.Equal(t, exp, got) + got = kubelet.getPluginDir("foobar") exp = filepath.Join(root, "plugins/foobar") assert.Equal(t, exp, got) @@ -55,6 +61,14 @@ func TestKubeletDirs(t *testing.T) { exp = filepath.Join(root, "pods/abc123/volumes/plugin/foobar") assert.Equal(t, exp, got) + got = kubelet.getPodVolumeDevicesDir("abc123") + exp = filepath.Join(root, "pods/abc123/volumeDevices") + assert.Equal(t, exp, got) + + got = kubelet.getPodVolumeDeviceDir("abc123", "plugin") + exp = filepath.Join(root, "pods/abc123/volumeDevices/plugin") + assert.Equal(t, exp, got) + got = kubelet.getPodPluginsDir("abc123") exp = filepath.Join(root, "pods/abc123/plugins") assert.Equal(t, exp, got) @@ -63,7 +77,29 @@ func TestKubeletDirs(t *testing.T) { exp = filepath.Join(root, "pods/abc123/plugins/foobar") assert.Equal(t, exp, got) + got = kubelet.getVolumeDevicePluginsDir() + exp = filepath.Join(root, "plugins") + assert.Equal(t, exp, got) + + got = kubelet.getVolumeDevicePluginDir("foobar") + exp = filepath.Join(root, "plugins", "foobar", "volumeDevices") + assert.Equal(t, exp, got) + got = kubelet.getPodContainerDir("abc123", "def456") exp = filepath.Join(root, "pods/abc123/containers/def456") assert.Equal(t, exp, got) + + got = kubelet.getPodResourcesDir() + exp = filepath.Join(root, "pod-resources") + assert.Equal(t, exp, got) + + // GetNodeConfig for containerManagerStub returns an empty node config + gotCfg := kubelet.GetNodeConfig() + expCfg := cm.NodeConfig{} + assert.Equal(t, expCfg, gotCfg) + + // GetPodCgroupRoot for containerManagerStub returns an empty string + got = kubelet.GetPodCgroupRoot() + exp = "" + assert.Equal(t, exp, got) } From 7d58ead809e97b23bb8f9fba3cefb5ab8cfa81e4 Mon Sep 17 00:00:00 2001 From: ynqa Date: Wed, 19 Aug 2020 10:07:36 +0900 Subject: [PATCH 2/2] delete tests which use container manager stub --- pkg/kubelet/kubelet_getters_test.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkg/kubelet/kubelet_getters_test.go b/pkg/kubelet/kubelet_getters_test.go index 8148ad179a5..a8fadcef6b3 100644 --- a/pkg/kubelet/kubelet_getters_test.go +++ b/pkg/kubelet/kubelet_getters_test.go @@ -21,8 +21,6 @@ import ( "testing" "github.com/stretchr/testify/assert" - - "k8s.io/kubernetes/pkg/kubelet/cm" ) func TestKubeletDirs(t *testing.T) { @@ -92,14 +90,4 @@ func TestKubeletDirs(t *testing.T) { got = kubelet.getPodResourcesDir() exp = filepath.Join(root, "pod-resources") assert.Equal(t, exp, got) - - // GetNodeConfig for containerManagerStub returns an empty node config - gotCfg := kubelet.GetNodeConfig() - expCfg := cm.NodeConfig{} - assert.Equal(t, expCfg, gotCfg) - - // GetPodCgroupRoot for containerManagerStub returns an empty string - got = kubelet.GetPodCgroupRoot() - exp = "" - assert.Equal(t, exp, got) }