Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Uniformly check returned error on OK response in middleend #512

Merged
merged 2 commits into from
Jul 5, 2023
Merged

Uniformly check returned error on OK response in middleend #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e04398
Use test error check uniformly for middleend encryption.
artek-koltun Jul 3, 2023
7322fc7
Use test error check uniformly for middleend QoS.
artek-koltun Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 53 additions & 51 deletions pkg/middleend/encryption_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
})
}
Expand Down Expand Up @@ -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")
}
})
}
Expand All @@ -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"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how this passed before ?

codes.OK,
"",
true,
0,
"",
Expand Down Expand Up @@ -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")
}
})
}
Expand Down Expand Up @@ -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")
}
})
}
Expand Down Expand Up @@ -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")
}
})
}
Expand Down Expand Up @@ -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))
}
Expand Down
12 changes: 6 additions & 6 deletions pkg/middleend/qos_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
Loading