Updates syncResolvingNamespace tests

* Makes `TestSyncResolvingNamespace` check the resulting subscription
* Removes unused fields from `TestSyncSubscriptions`

Signed-off-by: Mikalai Radchuk <[email protected]>

Author: Mikalai Radchuk

pkg/controller/operators/catalog/operator_test.go

@@ -1125,19 +1125,19 @@ func TestSyncCatalogSources(t *testing.T) {
 
 func TestSyncResolvingNamespace(t *testing.T) {
 	clockFake := utilclocktesting.NewFakeClock(time.Date(2018, time.January, 26, 20, 40, 0, 0, time.UTC))
+	now := metav1.NewTime(clockFake.Now())
 	testNamespace := "testNamespace"
 
 	type fields struct {
-		clientOptions     []clientfake.Option
-		sourcesLastUpdate metav1.Time
-		resolveErr        error
-		existingOLMObjs   []runtime.Object
-		existingObjects   []runtime.Object
+		clientOptions   []clientfake.Option
+		resolveErr      error
+		existingOLMObjs []runtime.Object
 	}
 	tests := []struct {
-		name    string
-		fields  fields
-		wantErr error
+		name              string
+		fields            fields
+		wantSubscriptions []*v1alpha1.Subscription
+		wantErr           error
 	}{
 		{
 			name: "NoError",
@@ -1164,6 +1164,26 @@ func TestSyncResolvingNamespace(t *testing.T) {
 					},
 				},
 			},
+			wantSubscriptions: []*v1alpha1.Subscription{
+				{
+					TypeMeta: metav1.TypeMeta{
+						Kind:       v1alpha1.SubscriptionKind,
+						APIVersion: v1alpha1.SchemeGroupVersion.String(),
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "sub",
+						Namespace: testNamespace,
+					},
+					Spec: &v1alpha1.SubscriptionSpec{
+						CatalogSource:          "src",
+						CatalogSourceNamespace: testNamespace,
+					},
+					Status: v1alpha1.SubscriptionStatus{
+						CurrentCSV: "",
+						State:      "",
+					},
+				},
+			},
 		},
 		{
 			name: "NotSatisfiableError",
@@ -1196,6 +1216,35 @@ func TestSyncResolvingNamespace(t *testing.T) {
 					},
 				},
 			},
+			wantSubscriptions: []*v1alpha1.Subscription{
+				{
+					TypeMeta: metav1.TypeMeta{
+						Kind:       v1alpha1.SubscriptionKind,
+						APIVersion: v1alpha1.SchemeGroupVersion.String(),
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "sub",
+						Namespace: testNamespace,
+					},
+					Spec: &v1alpha1.SubscriptionSpec{
+						CatalogSource:          "src",
+						CatalogSourceNamespace: testNamespace,
+					},
+					Status: v1alpha1.SubscriptionStatus{
+						CurrentCSV: "",
+						State:      "",
+						Conditions: []v1alpha1.SubscriptionCondition{
+							{
+								Type:    v1alpha1.SubscriptionResolutionFailed,
+								Reason:  "ConstraintsNotSatisfiable",
+								Message: "constraints not satisfiable: something",
+								Status:  corev1.ConditionTrue,
+							},
+						},
+						LastUpdated: now,
+					},
+				},
+			},
 		},
 		{
 			name: "OtherError",
@@ -1232,6 +1281,35 @@ func TestSyncResolvingNamespace(t *testing.T) {
 				},
 				resolveErr: fmt.Errorf("some error"),
 			},
+			wantSubscriptions: []*v1alpha1.Subscription{
+				{
+					TypeMeta: metav1.TypeMeta{
+						Kind:       v1alpha1.SubscriptionKind,
+						APIVersion: v1alpha1.SchemeGroupVersion.String(),
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "sub",
+						Namespace: testNamespace,
+					},
+					Spec: &v1alpha1.SubscriptionSpec{
+						CatalogSource:          "src",
+						CatalogSourceNamespace: testNamespace,
+					},
+					Status: v1alpha1.SubscriptionStatus{
+						CurrentCSV: "",
+						State:      "",
+						Conditions: []v1alpha1.SubscriptionCondition{
+							{
+								Type:    v1alpha1.SubscriptionResolutionFailed,
+								Reason:  "ErrorPreventedResolution",
+								Message: "some error",
+								Status:  corev1.ConditionTrue,
+							},
+						},
+						LastUpdated: now,
+					},
+				},
+			},
 			wantErr: fmt.Errorf("some error"),
 		},
 	}
@@ -1241,7 +1319,7 @@ func TestSyncResolvingNamespace(t *testing.T) {
 			ctx, cancel := context.WithCancel(context.TODO())
 			defer cancel()
 
-			o, err := NewFakeOperator(ctx, testNamespace, []string{testNamespace}, withClock(clockFake), withClientObjs(tt.fields.existingOLMObjs...), withK8sObjs(tt.fields.existingObjects...), withFakeClientOptions(tt.fields.clientOptions...))
+			o, err := NewFakeOperator(ctx, testNamespace, []string{testNamespace}, withClock(clockFake), withClientObjs(tt.fields.existingOLMObjs...), withFakeClientOptions(tt.fields.clientOptions...))
 			require.NoError(t, err)
 
 			o.reconciler = &fakes.FakeRegistryReconcilerFactory{
@@ -1254,7 +1332,6 @@ func TestSyncResolvingNamespace(t *testing.T) {
 				},
 			}
 
-			o.sourcesLastUpdate.Set(tt.fields.sourcesLastUpdate.Time)
 			o.resolver = &fakes.FakeStepResolver{
 				ResolveStepsStub: func(string) ([]*v1alpha1.Step, []v1alpha1.BundleLookup, []*v1alpha1.Subscription, error) {
 					return nil, nil, nil, tt.fields.resolveErr
@@ -1273,6 +1350,12 @@ func TestSyncResolvingNamespace(t *testing.T) {
 			} else {
 				require.NoError(t, err)
 			}
+
+			for _, s := range tt.wantSubscriptions {
+				fetched, err := o.client.OperatorsV1alpha1().Subscriptions(testNamespace).Get(context.TODO(), s.GetName(), metav1.GetOptions{})
+				require.NoError(t, err)
+				require.Equal(t, s, fetched)
+			}
 		})
 	}
 }

pkg/controller/operators/catalog/subscriptions_test.go

@@ -25,14 +25,11 @@ func TestSyncSubscriptions(t *testing.T) {
 	testNamespace := "testNamespace"
 
 	type fields struct {
-		clientOptions     []clientfake.Option
-		sourcesLastUpdate metav1.Time
-		resolveSteps      []*v1alpha1.Step
-		resolveSubs       []*v1alpha1.Subscription
-		bundleLookups     []v1alpha1.BundleLookup
-		resolveErr        error
-		existingOLMObjs   []runtime.Object
-		existingObjects   []runtime.Object
+		clientOptions        []clientfake.Option
+		resolveSteps         []*v1alpha1.Step
+		resolveSubs          []*v1alpha1.Subscription
+		resolveBundleLookups []v1alpha1.BundleLookup
+		existingOLMObjs      []runtime.Object
 	}
 	type args struct {
 		obj interface{}
@@ -378,7 +375,7 @@ func TestSyncSubscriptions(t *testing.T) {
 						},
 					},
 				},
-				bundleLookups: []v1alpha1.BundleLookup{
+				resolveBundleLookups: []v1alpha1.BundleLookup{
 					{
 						Path:       "bundle-path-a",
 						Identifier: "bundle-a",
@@ -1016,7 +1013,7 @@ func TestSyncSubscriptions(t *testing.T) {
 			ctx, cancel := context.WithCancel(context.TODO())
 			defer cancel()
 
-			o, err := NewFakeOperator(ctx, testNamespace, []string{testNamespace}, withClock(clockFake), withClientObjs(tt.fields.existingOLMObjs...), withK8sObjs(tt.fields.existingObjects...), withFakeClientOptions(tt.fields.clientOptions...))
+			o, err := NewFakeOperator(ctx, testNamespace, []string{testNamespace}, withClock(clockFake), withClientObjs(tt.fields.existingOLMObjs...), withFakeClientOptions(tt.fields.clientOptions...))
 			require.NoError(t, err)
 
 			o.reconciler = &fakes.FakeRegistryReconcilerFactory{
@@ -1029,10 +1026,9 @@ func TestSyncSubscriptions(t *testing.T) {
 				},
 			}
 
-			o.sourcesLastUpdate.Set(tt.fields.sourcesLastUpdate.Time)
 			o.resolver = &fakes.FakeStepResolver{
 				ResolveStepsStub: func(string) ([]*v1alpha1.Step, []v1alpha1.BundleLookup, []*v1alpha1.Subscription, error) {
-					return tt.fields.resolveSteps, tt.fields.bundleLookups, tt.fields.resolveSubs, tt.fields.resolveErr
+					return tt.fields.resolveSteps, tt.fields.resolveBundleLookups, tt.fields.resolveSubs, nil
 				},
 			}