From b46e2983e1149e12cf97de7c6e236b2739fde35d Mon Sep 17 00:00:00 2001 From: Artsiom Koltun Date: Wed, 12 Jul 2023 14:08:37 +0200 Subject: [PATCH] use tt to refer a test case in kvm Signed-off-by: Artsiom Koltun --- pkg/kvm/blk_test.go | 44 ++++++++++++++--------------- pkg/kvm/location_test.go | 12 ++++---- pkg/kvm/nvme_test.go | 60 ++++++++++++++++++++-------------------- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/pkg/kvm/blk_test.go b/pkg/kvm/blk_test.go index 6eaabfbe..adfd91f8 100644 --- a/pkg/kvm/blk_test.go +++ b/pkg/kvm/blk_test.go @@ -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") @@ -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 @@ -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") diff --git a/pkg/kvm/location_test.go b/pkg/kvm/location_test.go index ed62cc59..1281e46c 100644 --- a/pkg/kvm/location_test.go +++ b/pkg/kvm/location_test.go @@ -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) } }) } diff --git a/pkg/kvm/nvme_test.go b/pkg/kvm/nvme_test.go index d0237d5b..279a60e6 100644 --- a/pkg/kvm/nvme_test.go +++ b/pkg/kvm/nvme_test.go @@ -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) } }) } @@ -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) } @@ -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") @@ -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) } }) }