fix tests

operator-framework · Oct 10, 2018 · 09ef2c4 · 09ef2c4
1 parent e88a316
commit 09ef2c4
Showing 1 changed file with 64 additions and 10 deletions.
diff --git a/pkg/controller/operators/olm/operator_test.go b/pkg/controller/operators/olm/operator_test.go
@@ -1003,6 +1003,7 @@ func TestSyncOperatorGroups(t *testing.T) {
 
 	tests := []struct {
 		name               string
+		expectedEqual      bool
 		initialCsvs        []runtime.Object
 		initialCrds        []runtime.Object
 		initialObjs        []runtime.Object
@@ -1013,7 +1014,8 @@ func TestSyncOperatorGroups(t *testing.T) {
 		expectedAnnotation map[string]string
 	}{
 		{
-			name: "operator group with no matching namespace, no CSVs",
+			name:          "operator group with no matching namespace, no CSVs",
+			expectedEqual: true,
 			namespaces: []v1.Namespace{
 				{
 					ObjectMeta: metav1.ObjectMeta{
@@ -1036,7 +1038,8 @@ func TestSyncOperatorGroups(t *testing.T) {
 			expectedStatus: v1alpha2.OperatorGroupStatus{},
 		},
 		{
-			name: "operator group with matching namespace, no CSVs",
+			name:          "operator group with matching namespace, no CSVs",
+			expectedEqual: true,
 			namespaces: []v1.Namespace{
 				{
 					ObjectMeta: metav1.ObjectMeta{
@@ -1072,7 +1075,8 @@ func TestSyncOperatorGroups(t *testing.T) {
 			},
 		},
 		{
-			name: "operator group with matching namespace, CSV present",
+			name:          "operator group with matching namespace, CSV present",
+			expectedEqual: false,
 			namespaces: []v1.Namespace{
 				{
 					ObjectMeta: metav1.ObjectMeta{
@@ -1118,8 +1122,57 @@ func TestSyncOperatorGroups(t *testing.T) {
 				},
 				LastUpdated: timeNow(),
 			},
-			//expectedAnnotation: map[string]string{"olm.targetNamespaces": testNS},
-			expectedAnnotation: map[string]string{"BROKEN": testNS},
+			expectedAnnotation: map[string]string{"NOTFOUND": testNS},
+		},
+		{
+			name:          "operator group with matching namespace, CSV present",
+			expectedEqual: true,
+			namespaces: []v1.Namespace{
+				{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:   testNS,
+						Labels: aLabel,
+					},
+				},
+			},
+			initialCsvs: []runtime.Object{
+				csv("csv1",
+					testNS,
+					"",
+					installStrategy("csv1-dep1"),
+					[]*v1beta1.CustomResourceDefinition{crd("c1", "v1")},
+					[]*v1beta1.CustomResourceDefinition{},
+					v1alpha1.CSVPhaseSucceeded,
+				),
+			},
+			initialObjs: []runtime.Object{
+				deployment("csv1-dep1", testNS),
+			},
+			inputGroup: v1alpha2.OperatorGroup{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "operator-group-1",
+					Namespace: testNS,
+					Labels:    aLabel,
+				},
+				Spec: v1alpha2.OperatorGroupSpec{
+					Selector: metav1.LabelSelector{
+						MatchLabels: aLabel,
+					},
+				},
+			},
+			expectedStatus: v1alpha2.OperatorGroupStatus{
+				Namespaces: []v1.Namespace{
+					{
+						ObjectMeta: metav1.ObjectMeta{
+							Name:        testNS,
+							Labels:      aLabel,
+							Annotations: map[string]string{"test": "annotation"},
+						},
+					},
+				},
+				LastUpdated: timeNow(),
+			},
+			expectedAnnotation: map[string]string{"olm.targetNamespaces": testNS},
 		},
 	}
 
@@ -1134,6 +1187,7 @@ func TestSyncOperatorGroups(t *testing.T) {
 			for _, informer := range []cache.SharedIndexInformer{deployInformer.Informer()} {
 				go informer.Run(stopCh)
 			}
+			op.deploymentLister[testNS] = deployInformer.Lister()
 			informerFactory.Start(stopCh)
 			informerFactory.WaitForCacheSync(stopCh)
 
@@ -1145,18 +1199,18 @@ func TestSyncOperatorGroups(t *testing.T) {
 				// assuming CSVs are in correct namespace
 				for _, ns := range tc.namespaces {
 					deployments, err := op.deploymentLister[ns.Name].List(labels.Everything())
-					//deployments, err := op.OpClient.KubernetesInterface().AppsV1().Deployments(ns.Name).List(metav1.ListOptions{})
 					if err != nil {
 						t.Fatal(err)
 					}
-					t.Logf("JPEELER deployments in test using ns: %v: %v\n", ns.Name, deployments)
 					for _, deploy := range deployments {
-						assert.Equal(t, tc.expectedAnnotation, deploy.Spec.Template.Annotations)
+						if tc.expectedEqual {
+							assert.Equal(t, tc.expectedAnnotation, deploy.Spec.Template.Annotations)
+						} else {
+							assert.NotEqual(t, tc.expectedAnnotation, deploy.Spec.Template.Annotations)
+						}
 					}
 				}
 			}
-			close(stopCh)
-			<-stopCh
 		})
 	}
 }