From 0f5cc4027f0e5ee0a058b0e101328503d6b08891 Mon Sep 17 00:00:00 2001 From: Rohit Agarwal Date: Wed, 24 May 2017 17:26:34 -0700 Subject: [PATCH 1/2] Implement FakeVolumePlugin's ConstructVolumeSpec method according to interface expectation. This fixes #45803 and #46204. --- pkg/volume/testing/testing.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/volume/testing/testing.go b/pkg/volume/testing/testing.go index 8eccc091bf4..6c809c987cb 100644 --- a/pkg/volume/testing/testing.go +++ b/pkg/volume/testing/testing.go @@ -303,7 +303,11 @@ func (plugin *FakeVolumePlugin) GetAccessModes() []v1.PersistentVolumeAccessMode } func (plugin *FakeVolumePlugin) ConstructVolumeSpec(volumeName, mountPath string) (*Spec, error) { - return nil, nil + return &Spec{ + Volume: &v1.Volume{ + Name: volumeName, + }, + }, nil } func (plugin *FakeVolumePlugin) GetDeviceMountRefs(deviceMountPath string) ([]string, error) { From 2b594d61970c2d1c95cc71a28e9f3030f1e9f47a Mon Sep 17 00:00:00 2001 From: Rohit Agarwal Date: Thu, 25 May 2017 13:19:56 -0700 Subject: [PATCH 2/2] Add missing Cleanup() calls in kubelet tests. Possibly related to #45803 and #46204. --- pkg/kubelet/kubelet_network_test.go | 1 + pkg/kubelet/kubelet_volumes_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/kubelet/kubelet_network_test.go b/pkg/kubelet/kubelet_network_test.go index 35788008652..9cab6dc474c 100644 --- a/pkg/kubelet/kubelet_network_test.go +++ b/pkg/kubelet/kubelet_network_test.go @@ -112,6 +112,7 @@ func TestParseResolvConf(t *testing.T) { func TestComposeDNSSearch(t *testing.T) { testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) + defer testKubelet.Cleanup() kubelet := testKubelet.kubelet recorder := record.NewFakeRecorder(20) diff --git a/pkg/kubelet/kubelet_volumes_test.go b/pkg/kubelet/kubelet_volumes_test.go index 54eb794e341..739bdbe0645 100644 --- a/pkg/kubelet/kubelet_volumes_test.go +++ b/pkg/kubelet/kubelet_volumes_test.go @@ -33,6 +33,7 @@ import ( func TestListVolumesForPod(t *testing.T) { testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) + defer testKubelet.Cleanup() kubelet := testKubelet.kubelet pod := podWithUidNameNsSpec("12345678", "foo", "test", v1.PodSpec{