Fix flaky integration test

Author: Ankitasw

controllers/awscluster_controller_test.go

@@ -64,7 +64,7 @@ func TestAWSClusterReconciler_IntegrationTests(t *testing.T) {
 		mockCtrl.Finish()
 	}
 
-	t.Run("Should successfully reconcile AWCluster creation with unmanaged VPC", func(t *testing.T) {
+	t.Run("Should successfully reconcile AWSCluster creation with unmanaged VPC", func(t *testing.T) {
 		g := NewWithT(t)
 		mockCtrl = gomock.NewController(t)
 		ec2Mock := mock_ec2iface.NewMockEC2API(mockCtrl)

controllers/helpers_test.go

@@ -61,6 +61,10 @@ var (
 		},
 	}
 	expectedTags = []*elb.Tag{
+		{
+			Key:   aws.String("Name"),
+			Value: lbName,
+		},
 		{
 			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 			Value: aws.String("owned"),
@@ -69,10 +73,6 @@ var (
 			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 			Value: aws.String("apiserver"),
 		},
-		{
-			Key:   aws.String("Name"),
-			Value: lbName,
-		},
 	}
 )
 
@@ -162,23 +162,19 @@ func mockedCreateLBCalls(t *testing.T, m *mock_elbiface.MockELBAPIMockRecorder)
 		LoadBalancerName: aws.String(""),
 	})).MaxTimes(1)
 
-	m.AddTags(gomock.Eq(&elb.AddTagsInput{
-		LoadBalancerNames: aws.StringSlice([]string{""}),
-		Tags:              expectedTags,
-	})).Do(func(actual *elb.AddTagsInput) (*elb.AddTagsOutput, error) {
-		sortTagsByKey := func(tags []*elb.Tag) {
-			sort.Slice(tags, func(i, j int) bool {
-				return *(tags[i].Key) < *(tags[j].Key)
-			})
-		}
+	m.AddTags(gomock.AssignableToTypeOf(&elb.AddTagsInput{})).Return(&elb.AddTagsOutput{}, nil).Do(
+		func(actual *elb.AddTagsInput) {
+			sortTagsByKey := func(tags []*elb.Tag) {
+				sort.Slice(tags, func(i, j int) bool {
+					return *(tags[i].Key) < *(tags[j].Key)
+				})
+			}
 
-		sortTagsByKey(actual.Tags)
-		sortTagsByKey(expectedTags)
-		if !reflect.DeepEqual(expectedTags, actual.Tags) {
-			t.Fatalf("Actual AddTagsInput did not match expected, Actual : %v, Expected: %v", actual.Tags, expectedTags)
-		}
-		return &elb.AddTagsOutput{}, nil
-	}).AnyTimes()
+			sortTagsByKey(actual.Tags)
+			if !reflect.DeepEqual(expectedTags, actual.Tags) {
+				t.Fatalf("Actual AddTagsInput did not match expected, Actual : %v, Expected: %v", actual.Tags, expectedTags)
+			}
+		}).AnyTimes()
 	m.RemoveTags(gomock.Eq(&elb.RemoveTagsInput{
 		LoadBalancerNames: aws.StringSlice([]string{""}),
 		Tags: []*elb.TagKeyOnly{