From 97fab90cd5c64ce491e18827f1e90b66d8c9ab9e Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Wed, 13 Dec 2017 14:21:57 +0800 Subject: [PATCH] Fix unit tests --- pkg/cloudprovider/providers/azure/BUILD | 1 + pkg/cloudprovider/providers/azure/azure_test.go | 6 ++++-- pkg/cloudprovider/providers/azure/azure_util_test.go | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/BUILD b/pkg/cloudprovider/providers/azure/BUILD index a72de9f2a6d..322024f2c61 100644 --- a/pkg/cloudprovider/providers/azure/BUILD +++ b/pkg/cloudprovider/providers/azure/BUILD @@ -24,6 +24,7 @@ go_library( "azure_storageaccount.go", "azure_util.go", "azure_util_vmss.go", + "azure_vmsets.go", "azure_wrap.go", "azure_zones.go", ], diff --git a/pkg/cloudprovider/providers/azure/azure_test.go b/pkg/cloudprovider/providers/azure/azure_test.go index 073a82e6b36..f141ae2d1b0 100644 --- a/pkg/cloudprovider/providers/azure/azure_test.go +++ b/pkg/cloudprovider/providers/azure/azure_test.go @@ -870,6 +870,7 @@ func getTestCloud() (az *Cloud) { az.SecurityGroupsClient = newFakeAzureNSGClient() az.VirtualMachinesClient = newFakeAzureVirtualMachinesClient() az.InterfacesClient = newFakeAzureInterfacesClient() + az.vmSet = newAvailabilitySet(az) return az } @@ -1631,7 +1632,8 @@ func TestDecodeInstanceInfo(t *testing.T) { } } -func TestSplitProviderID(t *testing.T) { +func TestGetNodeNameByProviderID(t *testing.T) { + az := getTestCloud() providers := []struct { providerID string name types.NodeName @@ -1666,7 +1668,7 @@ func TestSplitProviderID(t *testing.T) { } for _, test := range providers { - name, err := splitProviderID(test.providerID) + name, err := az.vmSet.GetNodeNameByProviderID(test.providerID) if (err != nil) != test.fail { t.Errorf("Expected to failt=%t, with pattern %v", test.fail, test) } diff --git a/pkg/cloudprovider/providers/azure/azure_util_test.go b/pkg/cloudprovider/providers/azure/azure_util_test.go index 46f351f47b5..cac803c2eb0 100644 --- a/pkg/cloudprovider/providers/azure/azure_util_test.go +++ b/pkg/cloudprovider/providers/azure/azure_util_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" ) -func TestGetVmssInstanceID(t *testing.T) { +func TestGetScaleSetVMInstanceID(t *testing.T) { tests := []struct { msg string machineName string @@ -43,7 +43,7 @@ func TestGetVmssInstanceID(t *testing.T) { } for i, test := range tests { - instanceID, err := getVmssInstanceID(test.machineName) + instanceID, err := getScaleSetVMInstanceID(test.machineName) if test.expectError { assert.Error(t, err, fmt.Sprintf("TestCase[%d]: %s", i, test.msg)) } else {