From 903b98d2bf95d68e6d682dfc31b8878b57bb324b Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Sat, 18 Apr 2020 18:56:59 -0400 Subject: [PATCH 1/3] [AWS] fix block test --- pkg/volume/awsebs/aws_ebs_block_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/volume/awsebs/aws_ebs_block_test.go b/pkg/volume/awsebs/aws_ebs_block_test.go index 1a47046ef48..f3993c8d93a 100644 --- a/pkg/volume/awsebs/aws_ebs_block_test.go +++ b/pkg/volume/awsebs/aws_ebs_block_test.go @@ -78,8 +78,8 @@ func TestGetVolumeSpecFromGlobalMapPath(t *testing.T) { } block := v1.PersistentVolumeBlock specMode := spec.PersistentVolume.Spec.VolumeMode - if &specMode == nil { - t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v - %v", &specMode, block) + if specMode == nil { + t.Fatalf("Failed to get spec from GlobalMapPath: %v", err) } if *specMode != block { t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v - %v", *specMode, block) From c41932e9195f7f1e15488037ff596aa9a8ca6826 Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Mon, 20 Apr 2020 23:05:05 -0400 Subject: [PATCH 2/3] Code review changes --- pkg/volume/awsebs/aws_ebs_block_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/volume/awsebs/aws_ebs_block_test.go b/pkg/volume/awsebs/aws_ebs_block_test.go index f3993c8d93a..821ad940095 100644 --- a/pkg/volume/awsebs/aws_ebs_block_test.go +++ b/pkg/volume/awsebs/aws_ebs_block_test.go @@ -68,7 +68,7 @@ func TestGetVolumeSpecFromGlobalMapPath(t *testing.T) { // Good Path spec, err := plug.(*awsElasticBlockStorePlugin).getVolumeSpecFromGlobalMapPath("myVolume", expectedGlobalPath) if spec == nil || err != nil { - t.Fatalf("Failed to get spec from GlobalMapPath: %v", err) + t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v - %v", &specMode, block) } if spec.PersistentVolume.Name != "myVolume" { t.Errorf("Invalid PV name from GlobalMapPath spec: %s", spec.PersistentVolume.Name) From d7a59d769410af0dac641a7ce0bc2f381d550103 Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Mon, 20 Apr 2020 23:13:19 -0400 Subject: [PATCH 3/3] Code review changes --- pkg/volume/awsebs/aws_ebs_block_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/volume/awsebs/aws_ebs_block_test.go b/pkg/volume/awsebs/aws_ebs_block_test.go index 821ad940095..cb60f225a9c 100644 --- a/pkg/volume/awsebs/aws_ebs_block_test.go +++ b/pkg/volume/awsebs/aws_ebs_block_test.go @@ -68,7 +68,7 @@ func TestGetVolumeSpecFromGlobalMapPath(t *testing.T) { // Good Path spec, err := plug.(*awsElasticBlockStorePlugin).getVolumeSpecFromGlobalMapPath("myVolume", expectedGlobalPath) if spec == nil || err != nil { - t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v - %v", &specMode, block) + t.Fatalf("Failed to get spec from GlobalMapPath: %v", err) } if spec.PersistentVolume.Name != "myVolume" { t.Errorf("Invalid PV name from GlobalMapPath spec: %s", spec.PersistentVolume.Name) @@ -79,7 +79,7 @@ func TestGetVolumeSpecFromGlobalMapPath(t *testing.T) { block := v1.PersistentVolumeBlock specMode := spec.PersistentVolume.Spec.VolumeMode if specMode == nil { - t.Fatalf("Failed to get spec from GlobalMapPath: %v", err) + t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v - %v", specMode, block) } if *specMode != block { t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v - %v", *specMode, block)