Fix flakiness on optimized tests by sorting results by name

Since results where created in parallel the order of want and got could be different. This is fine as we don't care about the order, however it lead to tests being flaky.

This commit sorts slices in cmp.Diff by name to remove flakiness.

Author: TortillaZHawaii

pkg/forwardingrules/optimized/compare_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/forwardingrules"
 	"k8s.io/ingress-gce/pkg/forwardingrules/optimized"
@@ -198,7 +199,11 @@ func TestCompare(t *testing.T) {
 				t.Fatalf("optimized.Compare() error = %v", err)
 			}
 
-			if diff := cmp.Diff(ops, tC.wantCalls); diff != "" {
+			// We execute those in parallel so we don't care about the order at each stage
+			sortFROpt := cmpopts.SortSlices(func(a, b *composite.ForwardingRule) bool { return a.Name < b.Name })
+			sortDeletesOpt := cmpopts.SortSlices(func(a, b string) bool { return a < b })
+
+			if diff := cmp.Diff(ops, tC.wantCalls, sortFROpt, sortDeletesOpt); diff != "" {
 				t.Errorf("want != got, (-want, +got):\n%s", diff)
 			}
 		})

pkg/forwardingrules/optimized/fetch_test.go

@@ -89,7 +89,9 @@ func TestFetch(t *testing.T) {
 			}
 
 			ignoreOpts := cmpopts.IgnoreFields(composite.ForwardingRule{}, "Version", "SelfLink", "Region")
-			if diff := cmp.Diff(tC.want, got, ignoreOpts); diff != "" {
+			sortOpt := cmpopts.SortSlices(func(a, b *composite.ForwardingRule) bool { return a.Name < b.Name })
+
+			if diff := cmp.Diff(tC.want, got, ignoreOpts, sortOpt); diff != "" {
 				t.Errorf("Fetch(%q) returned diff (-want +got):\n%s", tC.link, diff)
 			}
 		})