Skip to content

Commit 85acc2a

Browse files
authored
Merge pull request #1194 from jichenjc/refactory_1
refactory test code (reuse existing function)
2 parents c362ac7 + 4faf220 commit 85acc2a

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

pkg/cloud/services/compute/instance_test.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -765,9 +765,7 @@ func TestService_ReconcileInstance(t *testing.T) {
765765
return s
766766
},
767767
expect: func(computeRecorder *MockClientMockRecorder, networkRecorder *mock_networking.MockNetworkClientMockRecorder) {
768-
computeRecorder.ListImages(images.ListOpts{Name: imageName}).Return([]images.Image{{ID: imageUUID}}, nil)
769-
computeRecorder.GetFlavorIDFromName(flavorName).Return(flavorUUID, nil)
770-
768+
expectDefaultImageAndFlavor(computeRecorder)
771769
expectUseExistingDefaultPort(networkRecorder)
772770

773771
// Looking up the second port fails
@@ -938,9 +936,7 @@ func TestService_ReconcileInstance(t *testing.T) {
938936
return s
939937
},
940938
expect: func(computeRecorder *MockClientMockRecorder, networkRecorder *mock_networking.MockNetworkClientMockRecorder) {
941-
computeRecorder.ListImages(images.ListOpts{Name: imageName}).Return([]images.Image{{ID: imageUUID}}, nil)
942-
computeRecorder.GetFlavorIDFromName(flavorName).Return(flavorUUID, nil)
943-
939+
expectDefaultImageAndFlavor(computeRecorder)
944940
extensions := []extensions.Extension{
945941
{Extension: common.Extension{Alias: "trunk"}},
946942
}

0 commit comments

Comments
 (0)