From 2e04398dde00c0c2794fdf180f29cd03f21e63f6 Mon Sep 17 00:00:00 2001 From: Artsiom Koltun Date: Mon, 3 Jul 2023 15:02:48 +0200 Subject: [PATCH 1/2] Use test error check uniformly for middleend encryption. Signed-off-by: Artsiom Koltun --- pkg/middleend/encryption_test.go | 104 ++++++++++++++++--------------- 1 file changed, 53 insertions(+), 51 deletions(-) diff --git a/pkg/middleend/encryption_test.go b/pkg/middleend/encryption_test.go index e02b1735..b78464f9 100644 --- a/pkg/middleend/encryption_test.go +++ b/pkg/middleend/encryption_test.go @@ -283,15 +283,15 @@ func TestMiddleEnd_CreateEncryptedVolume(t *testing.T) { } } - if err != nil { - if er, ok := status.FromError(err); ok { - if er.Code() != tt.errCode { - t.Error("error code: expected", tt.errCode, "received", er.Code()) - } - if er.Message() != tt.errMsg { - t.Error("error message: expected", tt.errMsg, "received", er.Message()) - } + if er, ok := status.FromError(err); ok { + if er.Code() != tt.errCode { + t.Error("error code: expected", tt.errCode, "received", er.Code()) } + if er.Message() != tt.errMsg { + t.Error("error message: expected", tt.errMsg, "received", er.Message()) + } + } else { + t.Error("expected grpc error status") } }) } @@ -644,15 +644,15 @@ func TestMiddleEnd_UpdateEncryptedVolume(t *testing.T) { } } - if err != nil { - if er, ok := status.FromError(err); ok { - if er.Code() != tt.errCode { - t.Error("error code: expected", tt.errCode, "received", er.Code()) - } - if er.Message() != tt.errMsg { - t.Error("error message: expected", tt.errMsg, "received", er.Message()) - } + if er, ok := status.FromError(err); ok { + if er.Code() != tt.errCode { + t.Error("error code: expected", tt.errCode, "received", er.Code()) + } + if er.Message() != tt.errMsg { + t.Error("error message: expected", tt.errMsg, "received", er.Message()) } + } else { + t.Error("expected grpc error status") } }) } @@ -669,12 +669,12 @@ func TestMiddleEnd_ListEncryptedVolumes(t *testing.T) { size int32 token string }{ - "valid request with invalid SPDK response": { + "valid request with empty result SPDK response": { "volume-test", nil, []string{`{"id":%d,"error":{"code":0,"message":""},"result":[]}`}, - codes.InvalidArgument, - fmt.Sprintf("Could not find any namespaces for NQN: %v", "nqn.2022-09.io.spdk:opi3"), + codes.OK, + "", true, 0, "", @@ -825,15 +825,15 @@ func TestMiddleEnd_ListEncryptedVolumes(t *testing.T) { } } - if err != nil { - if er, ok := status.FromError(err); ok { - if er.Code() != tt.errCode { - t.Error("error code: expected", tt.errCode, "received", er.Code()) - } - if er.Message() != tt.errMsg { - t.Error("error message: expected", tt.errMsg, "received", er.Message()) - } + if er, ok := status.FromError(err); ok { + if er.Code() != tt.errCode { + t.Error("error code: expected", tt.errCode, "received", er.Code()) } + if er.Message() != tt.errMsg { + t.Error("error message: expected", tt.errMsg, "received", er.Message()) + } + } else { + t.Error("expected grpc error status") } }) } @@ -934,15 +934,15 @@ func TestMiddleEnd_GetEncryptedVolume(t *testing.T) { } } - if err != nil { - if er, ok := status.FromError(err); ok { - if er.Code() != tt.errCode { - t.Error("error code: expected", tt.errCode, "received", er.Code()) - } - if er.Message() != tt.errMsg { - t.Error("error message: expected", tt.errMsg, "received", er.Message()) - } + if er, ok := status.FromError(err); ok { + if er.Code() != tt.errCode { + t.Error("error code: expected", tt.errCode, "received", er.Code()) + } + if er.Message() != tt.errMsg { + t.Error("error message: expected", tt.errMsg, "received", er.Message()) } + } else { + t.Error("expected grpc error status") } }) } @@ -1047,15 +1047,15 @@ func TestMiddleEnd_EncryptedVolumeStats(t *testing.T) { } } - if err != nil { - if er, ok := status.FromError(err); ok { - if er.Code() != tt.errCode { - t.Error("error code: expected", tt.errCode, "received", er.Code()) - } - if er.Message() != tt.errMsg { - t.Error("error message: expected", tt.errMsg, "received", er.Message()) - } + if er, ok := status.FromError(err); ok { + if er.Code() != tt.errCode { + t.Error("error code: expected", tt.errCode, "received", er.Code()) + } + if er.Message() != tt.errMsg { + t.Error("error message: expected", tt.errMsg, "received", er.Message()) } + } else { + t.Error("expected grpc error status") } }) } @@ -1183,16 +1183,18 @@ func TestMiddleEnd_DeleteEncryptedVolume(t *testing.T) { request := &pb.DeleteEncryptedVolumeRequest{Name: fname1, AllowMissing: tt.missing} response, err := testEnv.client.DeleteEncryptedVolume(testEnv.ctx, request) - if err != nil { - if er, ok := status.FromError(err); ok { - if er.Code() != tt.errCode { - t.Error("error code: expected", tt.errCode, "received", er.Code()) - } - if er.Message() != tt.errMsg { - t.Error("error message: expected", tt.errMsg, "received", er.Message()) - } + + if er, ok := status.FromError(err); ok { + if er.Code() != tt.errCode { + t.Error("error code: expected", tt.errCode, "received", er.Code()) + } + if er.Message() != tt.errMsg { + t.Error("error message: expected", tt.errMsg, "received", er.Message()) } + } else { + t.Error("expected grpc error status") } + if reflect.TypeOf(response) != reflect.TypeOf(tt.out) { t.Error("response: expected", reflect.TypeOf(tt.out), "received", reflect.TypeOf(response)) } From 7322fc7432cc05bbb93852a78d2c3788a2a05269 Mon Sep 17 00:00:00 2001 From: Artsiom Koltun Date: Mon, 3 Jul 2023 15:04:07 +0200 Subject: [PATCH 2/2] Use test error check uniformly for middleend QoS. Signed-off-by: Artsiom Koltun --- pkg/middleend/qos_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/middleend/qos_test.go b/pkg/middleend/qos_test.go index f590802d..4d032cce 100644 --- a/pkg/middleend/qos_test.go +++ b/pkg/middleend/qos_test.go @@ -305,7 +305,7 @@ func TestMiddleEnd_CreateQosVolume(t *testing.T) { t.Error("error message: expected", tt.errMsg, "received", er.Message()) } } else { - t.Errorf("expect grpc error status") + t.Error("expected grpc error status") } vol, ok := testEnv.opiSpdkServer.volumes.qosVolumes[testQosVolumeName] @@ -440,7 +440,7 @@ func TestMiddleEnd_DeleteQosVolume(t *testing.T) { t.Error("error message: expected", tt.errMsg, "received", er.Message()) } } else { - t.Errorf("expect grpc error status") + t.Error("expected grpc error status") } _, ok := testEnv.opiSpdkServer.volumes.qosVolumes[fname1] @@ -774,7 +774,7 @@ func TestMiddleEnd_UpdateQosVolume(t *testing.T) { t.Error("error message: expected", tt.errMsg, "received", er.Message()) } } else { - t.Errorf("expect grpc error status") + t.Error("expected grpc error status") } vol := testEnv.opiSpdkServer.volumes.qosVolumes[testQosVolumeName] @@ -896,7 +896,7 @@ func TestMiddleEnd_ListQosVolume(t *testing.T) { t.Error("error message: expected", tt.errMsg, "received", er.Message()) } } else { - t.Errorf("expect grpc error status") + t.Error("expected grpc error status") } if response != nil { @@ -959,7 +959,7 @@ func TestMiddleEnd_GetQosVolume(t *testing.T) { t.Error("error message: expected", tt.errMsg, "received", er.Message()) } } else { - t.Errorf("expect grpc error status") + t.Error("expected grpc error status") } if tt.errCode == codes.OK && !proto.Equal(tt.out, response) { @@ -1053,7 +1053,7 @@ func TestMiddleEnd_QosVolumeStats(t *testing.T) { t.Error("error message: expected", tt.errMsg, "received", er.Message()) } } else { - t.Errorf("expect grpc error status") + t.Error("expected grpc error status") } if tt.errCode == codes.OK && !proto.Equal(tt.out, response) {