test(subscription): update unit tests to use the namespace resolver

for subscription tests

Author: ecordell

pkg/controller/operators/catalog/operator.go

@@ -534,10 +534,10 @@ func (o *Operator) syncResolvingNamespace(obj interface{}) error {
 	})
 
 	// ignore error, we just want to fail early if we know there's no operatorgroup
-	ogs, _ := o.lister.OperatorsV1alpha2().OperatorGroupLister().OperatorGroups(namespace).List(labels.Everything())
-	if len(ogs) == 0 {
-		return fmt.Errorf("no operatorgroups in namespace")
-	}
+	// ogs, _ := o.lister.OperatorsV1alpha2().OperatorGroupLister().OperatorGroups(namespace).List(labels.Everything())
+	// if len(ogs) == 0 {
+	// 	return fmt.Errorf("no operatorgroups in namespace")
+	// }
 
 	// get the set of sources that should be used for resolution and best-effort get their connections working
 	logger.Debug("resolving sources")

pkg/controller/operators/catalog/operator_test.go

@@ -21,6 +21,7 @@ import (
 	"k8s.io/client-go/informers"
 	k8sfake "k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/client-go/util/workqueue"
 	apiregistrationfake "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake"
 
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
@@ -139,23 +140,23 @@ func TestExecutePlan(t *testing.T) {
 						Resource: v1alpha1.StepResource{
 							CatalogSource:          "catalog",
 							CatalogSourceNamespace: namespace,
-							Group:                  "",
-							Version:                "v1",
-							Kind:                   "Service",
-							Name:                   "service",
-							Manifest:               toManifest(service("service", namespace)),
+							Group:    "",
+							Version:  "v1",
+							Kind:     "Service",
+							Name:     "service",
+							Manifest: toManifest(service("service", namespace)),
 						},
 						Status: v1alpha1.StepStatusUnknown,
 					},
 					&v1alpha1.Step{
 						Resource: v1alpha1.StepResource{
 							CatalogSource:          "catalog",
 							CatalogSourceNamespace: namespace,
-							Group:                  "operators.coreos.com",
-							Version:                "v1alpha1",
-							Kind:                   "ClusterServiceVersion",
-							Name:                   "csv",
-							Manifest:               toManifest(csv("csv", namespace, nil, nil)),
+							Group:    "operators.coreos.com",
+							Version:  "v1alpha1",
+							Kind:     "ClusterServiceVersion",
+							Name:     "csv",
+							Manifest: toManifest(csv("csv", namespace, nil, nil)),
 						},
 						Status: v1alpha1.StepStatusUnknown,
 					},
@@ -507,12 +508,13 @@ func NewFakeOperator(clientObjs []runtime.Object, k8sObjs []runtime.Object, extO
 	// Create the new operator
 	queueOperator, err := queueinformer.NewOperatorFromClient(opClientFake, logrus.New())
 	op := &Operator{
-		Operator:  queueOperator,
-		client:    clientFake,
-		lister:    lister,
-		namespace: namespace,
-		sources:   make(map[resolver.CatalogKey]resolver.SourceRef),
-		resolver:  &fakes.FakeResolver{},
+		Operator:              queueOperator,
+		client:                clientFake,
+		lister:                lister,
+		namespace:             namespace,
+		namespaceResolveQueue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "resolver"),
+		sources:               make(map[resolver.CatalogKey]resolver.SourceRef),
+		resolver:              &fakes.FakeResolver{},
 	}
 
 	op.reconciler = &reconciler.RegistryReconcilerFactory{

pkg/controller/operators/catalog/subscriptions_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
@@ -495,7 +496,16 @@ func TestSyncSubscriptions(t *testing.T) {
 				},
 			}
 
-			require.Equal(t, tt.wantErr, o.syncSubscriptions(tt.args.obj))
+			namespace := &v1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: testNamespace,
+				},
+			}
+			if err := o.syncSubscriptions(tt.args.obj); err != nil {
+				require.Equal(t, tt.wantErr, err)
+			} else {
+				require.Equal(t, tt.wantErr, o.syncResolvingNamespace(namespace))
+			}
 
 			for _, s := range tt.wantSubscriptions {
 				fetched, err := o.client.OperatorsV1alpha1().Subscriptions(testNamespace).Get(s.GetName(), metav1.GetOptions{})