From 27a453fc77989067b1eb55fde2728b1b9ef24d50 Mon Sep 17 00:00:00 2001 From: Ashley Gau Date: Mon, 9 Jul 2018 12:58:19 -0700 Subject: [PATCH 1/2] move t.Parallel() out of for loop --- .../providers/gce/gce_loadbalancer_internal_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cloudprovider/providers/gce/gce_loadbalancer_internal_test.go b/pkg/cloudprovider/providers/gce/gce_loadbalancer_internal_test.go index f6257a7cea4..4ca93a6f091 100644 --- a/pkg/cloudprovider/providers/gce/gce_loadbalancer_internal_test.go +++ b/pkg/cloudprovider/providers/gce/gce_loadbalancer_internal_test.go @@ -80,6 +80,8 @@ func TestEnsureInternalBackendServiceUpdates(t *testing.T) { } func TestEnsureInternalBackendServiceGroups(t *testing.T) { + t.Parallel() + for desc, tc := range map[string]struct { mockModifier func(*cloud.MockGCE) }{ @@ -96,8 +98,6 @@ func TestEnsureInternalBackendServiceGroups(t *testing.T) { }, } { t.Run(desc, func(t *testing.T) { - t.Parallel() - vals := DefaultTestClusterValues() nodeNames := []string{"test-node-1"} From c20b3c25fdf8a89055bf4df4c44797d77fc08cd4 Mon Sep 17 00:00:00 2001 From: Ashley Gau Date: Mon, 9 Jul 2018 14:09:16 -0700 Subject: [PATCH 2/2] ensureInternalBackendServiceGroups inserts InstanceGroup links, not nodes --- .../providers/gce/gce_loadbalancer_internal_test.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkg/cloudprovider/providers/gce/gce_loadbalancer_internal_test.go b/pkg/cloudprovider/providers/gce/gce_loadbalancer_internal_test.go index 4ca93a6f091..d24148f20fb 100644 --- a/pkg/cloudprovider/providers/gce/gce_loadbalancer_internal_test.go +++ b/pkg/cloudprovider/providers/gce/gce_loadbalancer_internal_test.go @@ -117,12 +117,12 @@ func TestEnsureInternalBackendServiceGroups(t *testing.T) { err = gce.ensureInternalBackendService(bsName, "description", svc.Spec.SessionAffinity, cloud.SchemeInternal, "TCP", igLinks, "") require.NoError(t, err) - // Update the BackendService with new Instances + // Update the BackendService with new InstanceGroups if tc.mockModifier != nil { tc.mockModifier(gce.c.(*cloud.MockGCE)) } - newNodeNames := []string{"new-test-node-1", "new-test-node-2"} - err = gce.ensureInternalBackendServiceGroups(bsName, newNodeNames) + newIGLinks := []string{"new-test-ig-1", "new-test-ig-2"} + err = gce.ensureInternalBackendServiceGroups(bsName, newIGLinks) if tc.mockModifier != nil { assert.Error(t, err) return @@ -132,10 +132,8 @@ func TestEnsureInternalBackendServiceGroups(t *testing.T) { bs, err := gce.GetRegionBackendService(bsName, gce.region) assert.NoError(t, err) - // Check that the instances are updated - newNodes, err := createAndInsertNodes(gce, newNodeNames, vals.ZoneName) - newIgLinks, err := gce.ensureInternalInstanceGroups(igName, newNodes) - backends := backendsFromGroupLinks(newIgLinks) + // Check that the Backends reflect the new InstanceGroups + backends := backendsFromGroupLinks(newIGLinks) assert.Equal(t, bs.Backends, backends) }) }