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

Test: refer test case as tt consistently across all packages #531

Merged
merged 2 commits into from
Jul 12, 2023
Merged

Test: refer test case as tt consistently across all packages #531

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
6d41f9b
use tt to refer a test case in frontend
artek-koltun Jul 12, 2023
62f7e4a
use tt to refer a test case in kvm
artek-koltun Jul 12, 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
26 changes: 13 additions & 13 deletions pkg/frontend/blk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,34 +74,34 @@ func TestFrontEnd_CreateVirtioBlk(t *testing.T) {
},
}

for testName, test := range tests {
for testName, tt := range tests {
t.Run(testName, func(t *testing.T) {
testEnv := createTestEnvironment(true, test.spdk)
testEnv := createTestEnvironment(true, tt.spdk)
defer testEnv.Close()

if test.out != nil {
test.out.Name = testVirtioCtrlName
if tt.out != nil {
tt.out.Name = testVirtioCtrlName
}

request := &pb.CreateVirtioBlkRequest{VirtioBlk: test.in, VirtioBlkId: test.id}
request := &pb.CreateVirtioBlkRequest{VirtioBlk: tt.in, VirtioBlkId: tt.id}
response, err := testEnv.client.CreateVirtioBlk(testEnv.ctx, request)
if response != nil {
wantOut, _ := proto.Marshal(test.out)
wantOut, _ := proto.Marshal(tt.out)
gotOut, _ := proto.Marshal(response)

if !bytes.Equal(wantOut, gotOut) {
t.Error("response: expected", test.out, "received", response)
t.Error("response: expected", tt.out, "received", response)
}
} else if test.out != nil {
t.Error("response: expected", test.out, "received nil")
} else if tt.out != nil {
t.Error("response: expected", tt.out, "received nil")
}

if er, ok := status.FromError(err); ok {
if er.Code() != test.errCode {
t.Error("error code: expected", test.errCode, "received", er.Code())
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != test.errMsg {
t.Error("error message: expected", test.errMsg, "received", er.Message())
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
Expand Down
44 changes: 22 additions & 22 deletions pkg/kvm/blk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,36 +149,36 @@ func TestCreateVirtioBlk(t *testing.T) {
},
}

for testName, test := range tests {
for testName, tt := range tests {
t.Run(testName, func(t *testing.T) {
opiSpdkServer := frontend.NewServer(test.jsonRPC)
qmpServer := startMockQmpServer(t, test.mockQmpCalls)
opiSpdkServer := frontend.NewServer(tt.jsonRPC)
qmpServer := startMockQmpServer(t, tt.mockQmpCalls)
defer qmpServer.Stop()
qmpAddress := qmpServer.socketPath
if test.nonDefaultQmpAddress != "" {
qmpAddress = test.nonDefaultQmpAddress
if tt.nonDefaultQmpAddress != "" {
qmpAddress = tt.nonDefaultQmpAddress
}
kvmServer := NewServer(opiSpdkServer, qmpAddress, qmpServer.testDir, test.buses)
kvmServer := NewServer(opiSpdkServer, qmpAddress, qmpServer.testDir, tt.buses)
kvmServer.timeout = qmplibTimeout
request := server.ProtoClone(test.in)
request := server.ProtoClone(tt.in)

out, err := kvmServer.CreateVirtioBlk(context.Background(), request)

if er, ok := status.FromError(err); ok {
if er.Code() != test.errCode {
t.Error("error code: expected", test.errCode, "received", er.Code())
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != test.errMsg {
t.Error("error message: expected", test.errMsg, "received", er.Message())
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Errorf("expected grpc error status")
}

gotOut, _ := proto.Marshal(out)
wantOut, _ := proto.Marshal(test.out)
wantOut, _ := proto.Marshal(tt.out)
if !bytes.Equal(gotOut, wantOut) {
t.Errorf("Expected out %v, got %v", test.out, out)
t.Errorf("Expected out %v, got %v", tt.out, out)
}
if !qmpServer.WereExpectedCallsPerformed() {
t.Errorf("Not all expected calls were performed")
Expand Down Expand Up @@ -250,17 +250,17 @@ func TestDeleteVirtioBlk(t *testing.T) {
},
}

for testName, test := range tests {
for testName, tt := range tests {
t.Run(testName, func(t *testing.T) {
opiSpdkServer := frontend.NewServer(test.jsonRPC)
opiSpdkServer := frontend.NewServer(tt.jsonRPC)
opiSpdkServer.Virt.BlkCtrls[testVirtioBlkName] =
server.ProtoClone(testCreateVirtioBlkRequest.VirtioBlk)
opiSpdkServer.Virt.BlkCtrls[testVirtioBlkName].Name = testVirtioBlkName
qmpServer := startMockQmpServer(t, test.mockQmpCalls)
qmpServer := startMockQmpServer(t, tt.mockQmpCalls)
defer qmpServer.Stop()
qmpAddress := qmpServer.socketPath
if test.nonDefaultQmpAddress != "" {
qmpAddress = test.nonDefaultQmpAddress
if tt.nonDefaultQmpAddress != "" {
qmpAddress = tt.nonDefaultQmpAddress
}
kvmServer := NewServer(opiSpdkServer, qmpAddress, qmpServer.testDir, nil)
kvmServer.timeout = qmplibTimeout
Expand All @@ -269,11 +269,11 @@ func TestDeleteVirtioBlk(t *testing.T) {
_, err := kvmServer.DeleteVirtioBlk(context.Background(), request)

if er, ok := status.FromError(err); ok {
if er.Code() != test.errCode {
t.Error("error code: expected", test.errCode, "received", er.Code())
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != test.errMsg {
t.Error("error message: expected", test.errMsg, "received", er.Message())
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Errorf("expected grpc error status")
Expand Down
12 changes: 6 additions & 6 deletions pkg/kvm/location_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ func TestNewDeviceLocator(t *testing.T) {
},
}

for testName, test := range tests {
for testName, tt := range tests {
t.Run(testName, func(t *testing.T) {
defer func() {
r := recover()
if (r != nil) != test.wantPanic {
t.Errorf("newDeviceLocator() recover = %v, wantPanic = %v", r, test.wantPanic)
if (r != nil) != tt.wantPanic {
t.Errorf("newDeviceLocator() recover = %v, wantPanic = %v", r, tt.wantPanic)
}
}()
before := newDeviceLocator(test.buses)
if !reflect.DeepEqual(before, test.expectLocator) {
t.Error("response: expected", test.expectLocator, "received", before)
before := newDeviceLocator(tt.buses)
if !reflect.DeepEqual(before, tt.expectLocator) {
t.Error("response: expected", tt.expectLocator, "received", before)
}
})
}
Expand Down
60 changes: 30 additions & 30 deletions pkg/kvm/nvme_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,48 +286,48 @@ func TestCreateNvmeController(t *testing.T) {
},
}

for testName, test := range tests {
for testName, tt := range tests {
t.Run(testName, func(t *testing.T) {
opiSpdkServer := frontend.NewServer(test.jsonRPC)
opiSpdkServer := frontend.NewServer(tt.jsonRPC)
opiSpdkServer.Nvme.Subsystems[testSubsystemName] = &testSubsystem
qmpServer := startMockQmpServer(t, test.mockQmpCalls)
qmpServer := startMockQmpServer(t, tt.mockQmpCalls)
defer qmpServer.Stop()
qmpAddress := qmpServer.socketPath
if test.nonDefaultQmpAddress != "" {
qmpAddress = test.nonDefaultQmpAddress
if tt.nonDefaultQmpAddress != "" {
qmpAddress = tt.nonDefaultQmpAddress
}
kvmServer := NewServer(opiSpdkServer, qmpAddress, qmpServer.testDir, test.buses)
kvmServer := NewServer(opiSpdkServer, qmpAddress, qmpServer.testDir, tt.buses)
kvmServer.timeout = qmplibTimeout
testCtrlrDir := controllerDirPath(qmpServer.testDir, testSubsystemID)
if test.ctrlrDirExistsBeforeOperation &&
if tt.ctrlrDirExistsBeforeOperation &&
os.Mkdir(testCtrlrDir, os.ModePerm) != nil {
log.Panicf("Couldn't create ctrlr dir for test")
}
request := server.ProtoClone(test.in)
request := server.ProtoClone(tt.in)

out, err := kvmServer.CreateNvmeController(context.Background(), request)
if er, ok := status.FromError(err); ok {
if er.Code() != test.errCode {
t.Error("error code: expected", test.errCode, "received", er.Code())
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != test.errMsg {
t.Error("error message: expected", test.errMsg, "received", er.Message())
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Errorf("expected grpc error status")
}

gotOut, _ := proto.Marshal(out)
wantOut, _ := proto.Marshal(test.out)
wantOut, _ := proto.Marshal(tt.out)
if !bytes.Equal(gotOut, wantOut) {
t.Errorf("Expected out %v, got %v", test.out, out)
t.Errorf("Expected out %v, got %v", tt.out, out)
}
if !qmpServer.WereExpectedCallsPerformed() {
t.Errorf("Not all expected calls were performed")
}
ctrlrDirExists := dirExists(testCtrlrDir)
if test.ctrlrDirExistsAfterOperation != ctrlrDirExists {
t.Errorf("Expect controller dir exists %v, got %v", test.ctrlrDirExistsAfterOperation, ctrlrDirExists)
if tt.ctrlrDirExistsAfterOperation != ctrlrDirExists {
t.Errorf("Expect controller dir exists %v, got %v", tt.ctrlrDirExistsAfterOperation, ctrlrDirExists)
}
})
}
Expand Down Expand Up @@ -431,30 +431,30 @@ func TestDeleteNvmeController(t *testing.T) {
},
}

for testName, test := range tests {
for testName, tt := range tests {
t.Run(testName, func(t *testing.T) {
opiSpdkServer := frontend.NewServer(test.jsonRPC)
opiSpdkServer := frontend.NewServer(tt.jsonRPC)
opiSpdkServer.Nvme.Subsystems[testSubsystemName] = &testSubsystem
if !test.noController {
if !tt.noController {
opiSpdkServer.Nvme.Controllers[testNvmeControllerName] =
server.ProtoClone(testCreateNvmeControllerRequest.NvmeController)
opiSpdkServer.Nvme.Controllers[testNvmeControllerName].Name = testNvmeControllerID
}
qmpServer := startMockQmpServer(t, test.mockQmpCalls)
qmpServer := startMockQmpServer(t, tt.mockQmpCalls)
defer qmpServer.Stop()
qmpAddress := qmpServer.socketPath
if test.nonDefaultQmpAddress != "" {
qmpAddress = test.nonDefaultQmpAddress
if tt.nonDefaultQmpAddress != "" {
qmpAddress = tt.nonDefaultQmpAddress
}
kvmServer := NewServer(opiSpdkServer, qmpAddress, qmpServer.testDir, nil)
kvmServer.timeout = qmplibTimeout
testCtrlrDir := controllerDirPath(qmpServer.testDir, testSubsystemID)
if test.ctrlrDirExistsBeforeOperation {
if tt.ctrlrDirExistsBeforeOperation {
if err := os.Mkdir(testCtrlrDir, os.ModePerm); err != nil {
log.Panic(err)
}

if test.nonEmptyCtrlrDirAfterSpdkCall {
if tt.nonEmptyCtrlrDirAfterSpdkCall {
if err := os.Mkdir(filepath.Join(testCtrlrDir, "ctrlr"), os.ModeDir); err != nil {
log.Panic(err)
}
Expand All @@ -465,11 +465,11 @@ func TestDeleteNvmeController(t *testing.T) {
_, err := kvmServer.DeleteNvmeController(context.Background(), request)

if er, ok := status.FromError(err); ok {
if er.Code() != test.errCode {
t.Error("error code: expected", test.errCode, "received", er.Code())
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != test.errMsg {
t.Error("error message: expected", test.errMsg, "received", er.Message())
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Errorf("expected grpc error status")
Expand All @@ -479,9 +479,9 @@ func TestDeleteNvmeController(t *testing.T) {
t.Errorf("Not all expected calls were performed")
}
ctrlrDirExists := dirExists(testCtrlrDir)
if ctrlrDirExists != test.ctrlrDirExistsAfterOperation {
if ctrlrDirExists != tt.ctrlrDirExistsAfterOperation {
t.Errorf("Expect controller dir exists %v, got %v",
test.ctrlrDirExistsAfterOperation, ctrlrDirExists)
tt.ctrlrDirExistsAfterOperation, ctrlrDirExists)
}
})
}
Expand Down
Loading