From 3893e28b669063dbefb1c5266b22c0145f076588 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Tue, 22 Aug 2017 23:35:54 -0700 Subject: [PATCH 01/10] Fix swallowed error in attachdetach tests --- .../volume/attachdetach/attach_detach_controller_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/controller/volume/attachdetach/attach_detach_controller_test.go b/pkg/controller/volume/attachdetach/attach_detach_controller_test.go index b63103bf2f8..6145b1f933a 100644 --- a/pkg/controller/volume/attachdetach/attach_detach_controller_test.go +++ b/pkg/controller/volume/attachdetach/attach_detach_controller_test.go @@ -99,6 +99,10 @@ func Test_AttachDetachControllerStateOfWolrdPopulators_Positive(t *testing.T) { // Test the ActualStateOfWorld contains all the node volumes nodes, err := adc.nodeLister.List(labels.Everything()) + if err != nil { + t.Fatalf("Failed to list nodes in indexer. Expected: Actual: %v", err) + } + for _, node := range nodes { nodeName := types.NodeName(node.Name) for _, attachedVolume := range node.Status.VolumesAttached { From 14ad3b566e94b580a89f6a67b0355b260d38e735 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Fri, 25 Aug 2017 19:56:47 -0700 Subject: [PATCH 02/10] Fix swallowed errs in volume util package --- pkg/volume/util/device_util_linux_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/volume/util/device_util_linux_test.go b/pkg/volume/util/device_util_linux_test.go index 59c86a7105c..00acdea12f9 100644 --- a/pkg/volume/util/device_util_linux_test.go +++ b/pkg/volume/util/device_util_linux_test.go @@ -119,7 +119,13 @@ func TestFindDeviceForPath(t *testing.T) { if disk != "sde" { t.Fatalf("disk [%s] didn't match expected sde", disk) } + if err != nil { + t.Fatalf("error finding device for path /dev/sde:%v", err) + } disk, err = findDeviceForPath("/returns/a/dev", io) + if err != nil { + t.Fatalf("error finding device for path /returns/a/dev:%v", err) + } if disk != "sde" { t.Fatalf("disk [%s] didn't match expected sde", disk) } From d564d0696716af78487b5991a13c39ea9c79fb47 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Fri, 25 Aug 2017 20:05:06 -0700 Subject: [PATCH 03/10] Fix swallowed error in storageos --- pkg/volume/storageos/storageos_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/volume/storageos/storageos_test.go b/pkg/volume/storageos/storageos_test.go index 37d6cc71f76..182deffd352 100644 --- a/pkg/volume/storageos/storageos_test.go +++ b/pkg/volume/storageos/storageos_test.go @@ -363,7 +363,9 @@ func TestPersistentClaimReadOnlyFlag(t *testing.T) { fakeConfig := &fakeConfig{} apiCfg := fakeConfig.GetAPIConfig() mounter, err := plug.(*storageosPlugin).newMounterInternal(spec, pod, apiCfg, fakeManager, &mount.FakeMounter{}, mount.NewFakeExec(nil)) - + if err != nil { + t.Fatalf("error creating a new internal mounter:%v", err) + } if !mounter.GetAttributes().ReadOnly { t.Errorf("Expected true for mounter.IsReadOnly") } From 4c86c891defa8afe8a592faf29273e3cc1491eeb Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Fri, 25 Aug 2017 20:28:24 -0700 Subject: [PATCH 04/10] Fix swallowed errors in portworx tests --- pkg/volume/portworx/portworx_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/volume/portworx/portworx_test.go b/pkg/volume/portworx/portworx_test.go index 195e6c78472..5765a08f51f 100644 --- a/pkg/volume/portworx/portworx_test.go +++ b/pkg/volume/portworx/portworx_test.go @@ -205,6 +205,9 @@ func TestPlugin(t *testing.T) { } provisioner, err := plug.(*portworxVolumePlugin).newProvisionerInternal(options, &fakePortworxManager{}) + if err != nil { + t.Errorf("Error creating a new provisioner:%v", err) + } persistentSpec, err := provisioner.Provision() if err != nil { t.Errorf("Provision() failed: %v", err) @@ -228,6 +231,9 @@ func TestPlugin(t *testing.T) { PersistentVolume: persistentSpec, } deleter, err := plug.(*portworxVolumePlugin).newDeleterInternal(volSpec, &fakePortworxManager{}) + if err != nil { + t.Errorf("Error creating a new Deleter:%v", err) + } err = deleter.Delete() if err != nil { t.Errorf("Deleter() failed: %v", err) From f482646372b5406c270048e937b961186d1dcf1a Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Fri, 25 Aug 2017 21:06:34 -0700 Subject: [PATCH 05/10] Fix swallowed error in tests of host_path package --- pkg/volume/host_path/host_path_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/volume/host_path/host_path_test.go b/pkg/volume/host_path/host_path_test.go index 8d78b99d0fb..c6124ae2545 100644 --- a/pkg/volume/host_path/host_path_test.go +++ b/pkg/volume/host_path/host_path_test.go @@ -158,7 +158,9 @@ func TestProvisioner(t *testing.T) { tempPath := fmt.Sprintf("/tmp/hostpath/%s", uuid.NewUUID()) defer os.RemoveAll(tempPath) err := os.MkdirAll(tempPath, 0750) - + if err != nil { + t.Errorf("Failed to create tempPath %s error:%v", tempPath, err) + } plugMgr := volume.VolumePluginMgr{} plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{ProvisioningEnabled: true}), volumetest.NewFakeVolumeHost("/tmp/fake", nil, nil)) From 15dccee12da51200d82900ee9463f716bf8f03f7 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Fri, 25 Aug 2017 21:16:34 -0700 Subject: [PATCH 06/10] Fix swallowed errors in tests of gce_pd --- pkg/volume/gce_pd/gce_pd_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/volume/gce_pd/gce_pd_test.go b/pkg/volume/gce_pd/gce_pd_test.go index 4dc1761ec75..cf23835585a 100644 --- a/pkg/volume/gce_pd/gce_pd_test.go +++ b/pkg/volume/gce_pd/gce_pd_test.go @@ -179,6 +179,9 @@ func TestPlugin(t *testing.T) { PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete, } provisioner, err := plug.(*gcePersistentDiskPlugin).newProvisionerInternal(options, &fakePDManager{}) + if err != nil { + t.Errorf("Error creating new provisioner:%v", err) + } persistentSpec, err := provisioner.Provision() if err != nil { t.Errorf("Provision() failed: %v", err) @@ -202,6 +205,9 @@ func TestPlugin(t *testing.T) { PersistentVolume: persistentSpec, } deleter, err := plug.(*gcePersistentDiskPlugin).newDeleterInternal(volSpec, &fakePDManager{}) + if err != nil { + t.Errorf("Error creating new deleter:%v", err) + } err = deleter.Delete() if err != nil { t.Errorf("Deleter() failed: %v", err) From 5abbd0f96fa4c3e9b2ff29cb5610c5d46ea427e8 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Fri, 25 Aug 2017 21:28:30 -0700 Subject: [PATCH 07/10] Fix swallowed error in tests for flocker package --- pkg/volume/flocker/flocker_volume_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/volume/flocker/flocker_volume_test.go b/pkg/volume/flocker/flocker_volume_test.go index 8abc62c82e2..dc6a508ddea 100644 --- a/pkg/volume/flocker/flocker_volume_test.go +++ b/pkg/volume/flocker/flocker_volume_test.go @@ -41,7 +41,7 @@ func newTestableProvisioner(assert *assert.Assertions, options volume.VolumeOpti assert.NoError(err, "Can't find the plugin by name") provisioner, err := plug.(*flockerPlugin).newProvisionerInternal(options, &fakeFlockerUtil{}) - + assert.NoError(err, fmt.Sprintf("Can't create new provisioner:%v", err)) return tmpDir, provisioner } From e8a3424c1c08e22b09f7bf83926d307ebc4849c7 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Fri, 25 Aug 2017 21:34:40 -0700 Subject: [PATCH 08/10] Fix swallowed error in fc --- pkg/volume/fc/fc_util.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/volume/fc/fc_util.go b/pkg/volume/fc/fc_util.go index 5ad268c4b2f..f229d5700d6 100644 --- a/pkg/volume/fc/fc_util.go +++ b/pkg/volume/fc/fc_util.go @@ -220,6 +220,9 @@ func (util *FCUtil) AttachDisk(b fcDiskMounter) (string, error) { // mount it globalPDPath := util.MakeGlobalPDName(*b.fcDisk) noMnt, err := b.mounter.IsLikelyNotMountPoint(globalPDPath) + if err != nil { + return devicePath, fmt.Errorf("Heuristic determination of mount point failed:%v", err) + } if !noMnt { glog.Infof("fc: %s already mounted", globalPDPath) return devicePath, nil From 09f4ecffac127fe274622d36c32bfc3e0fd9977f Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Sat, 26 Aug 2017 09:25:42 -0700 Subject: [PATCH 09/10] Fix swallowed errors in aws_ebs tests --- pkg/volume/aws_ebs/aws_ebs_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkg/volume/aws_ebs/aws_ebs_test.go b/pkg/volume/aws_ebs/aws_ebs_test.go index 85538b3649a..7c149bf06d6 100644 --- a/pkg/volume/aws_ebs/aws_ebs_test.go +++ b/pkg/volume/aws_ebs/aws_ebs_test.go @@ -186,6 +186,9 @@ func TestPlugin(t *testing.T) { PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete, } provisioner, err := plug.(*awsElasticBlockStorePlugin).newProvisionerInternal(options, &fakePDManager{}) + if err != nil { + t.Errorf("Error creating new provisioner:%v", err) + } persistentSpec, err := provisioner.Provision() if err != nil { t.Errorf("Provision() failed: %v", err) @@ -209,6 +212,9 @@ func TestPlugin(t *testing.T) { PersistentVolume: persistentSpec, } deleter, err := plug.(*awsElasticBlockStorePlugin).newDeleterInternal(volSpec, &fakePDManager{}) + if err != nil { + t.Errorf("Error creating new deleter:%v", err) + } err = deleter.Delete() if err != nil { t.Errorf("Deleter() failed: %v", err) @@ -288,11 +294,17 @@ func TestMounterAndUnmounterTypeAssert(t *testing.T) { } mounter, err := plug.(*awsElasticBlockStorePlugin).newMounterInternal(volume.NewSpecFromVolume(spec), types.UID("poduid"), &fakePDManager{}, &mount.FakeMounter{}) + if err != nil { + t.Errorf("Error creating new mounter:%v", err) + } if _, ok := mounter.(volume.Unmounter); ok { t.Errorf("Volume Mounter can be type-assert to Unmounter") } unmounter, err := plug.(*awsElasticBlockStorePlugin).newUnmounterInternal("vol1", types.UID("poduid"), &fakePDManager{}, &mount.FakeMounter{}) + if err != nil { + t.Errorf("Error creating new unmounter:%v", err) + } if _, ok := unmounter.(volume.Mounter); ok { t.Errorf("Volume Unmounter can be type-assert to Mounter") } From 5cc930a7fa66056d289ee2723b7e085f4eac9cd2 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Thu, 7 Sep 2017 12:20:12 -0700 Subject: [PATCH 10/10] Move error check in TestFindDeviceForPath() --- pkg/volume/util/device_util_linux_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/volume/util/device_util_linux_test.go b/pkg/volume/util/device_util_linux_test.go index 00acdea12f9..94ac9b5a47b 100644 --- a/pkg/volume/util/device_util_linux_test.go +++ b/pkg/volume/util/device_util_linux_test.go @@ -116,12 +116,12 @@ func TestFindDeviceForPath(t *testing.T) { io := &mockOsIOHandler{} disk, err := findDeviceForPath("/dev/sde", io) - if disk != "sde" { - t.Fatalf("disk [%s] didn't match expected sde", disk) - } if err != nil { t.Fatalf("error finding device for path /dev/sde:%v", err) } + if disk != "sde" { + t.Fatalf("disk [%s] didn't match expected sde", disk) + } disk, err = findDeviceForPath("/returns/a/dev", io) if err != nil { t.Fatalf("error finding device for path /returns/a/dev:%v", err)