test/e2e: stop failing on teardown

The issue for this is open for years and it's not super interesting to
go debug it. The test threads will exit when the test process does.
Having teardown fail means none of the other tests run for me.

Signed-off-by: Steve Kuznetsov <[email protected]>

Author: stevekuznetsov

pkg/controller/registry/resolver/resolver_test.go

@@ -1,6 +1,7 @@
 package resolver
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"math/rand"
@@ -1449,6 +1450,17 @@ func TestSolveOperators_TransferApiOwnership(t *testing.T) {
 						subLister: fakeSubscriptionLister(p.subs),
 						ogLister:  fakeOperatorGroupLister{og},
 						logger:    logger,
+						listSubscriptions: func(ctx context.Context) (*v1alpha1.SubscriptionList, error) {
+							return &v1alpha1.SubscriptionList{
+								Items: func(ptrs []*v1alpha1.Subscription) []v1alpha1.Subscription {
+									var out []v1alpha1.Subscription
+									for _, sub := range ptrs {
+										out = append(out, *sub)
+									}
+									return out
+								}(p.subs),
+							}, nil
+						},
 					},
 				}),
 				log: logger,
@@ -1460,7 +1472,13 @@ func TestSolveOperators_TransferApiOwnership(t *testing.T) {
 					pkg = si.Package
 					channel = si.Channel
 				}
-				csvs = append(csvs, existingOperator(namespace, o.Name, pkg, channel, o.Replaces, o.ProvidedAPIs, o.RequiredAPIs, nil, nil))
+				csv := existingOperator(namespace, o.Name, pkg, channel, o.Replaces, o.ProvidedAPIs, o.RequiredAPIs, nil, nil)
+				csvs = append(csvs, csv)
+				if o.SourceInfo != nil && o.SourceInfo.Subscription != nil {
+					o.SourceInfo.Subscription.Status = v1alpha1.SubscriptionStatus{
+						InstalledCSV: csv.Name,
+					}
+				}
 			}
 
 			var err error

pkg/controller/registry/resolver/source_csvs.go

@@ -37,7 +37,9 @@ func (csp *csvSourceProvider) Sources(namespaces ...string) map[cache.SourceKey]
 			subLister: csp.subLister.Subscriptions(namespace),
 			ogLister:  csp.ogLister.OperatorGroups(namespace),
 			logger:    csp.logger,
-			client:    csp.client,
+			listSubscriptions: func(ctx context.Context) (*v1alpha1.SubscriptionList, error) {
+				return csp.client.OperatorsV1alpha1().Subscriptions(namespace).List(ctx, metav1.ListOptions{})
+			},
 		}
 		break // first ns is assumed to be the target ns, todo: make explicit
 	}
@@ -51,7 +53,7 @@ type csvSource struct {
 	ogLister  v1listers.OperatorGroupNamespaceLister
 	logger    logrus.StdLogger
 
-	client operatorv1clientset.Interface
+	listSubscriptions func(context.Context) (*v1alpha1.SubscriptionList, error)
 }
 
 func (s *csvSource) Snapshot(ctx context.Context) (*cache.Snapshot, error) {
@@ -93,7 +95,7 @@ func (s *csvSource) Snapshot(ctx context.Context) (*cache.Snapshot, error) {
 
 		if cachedSubscription, ok := csvSubscriptions[csv]; !ok || cachedSubscription == nil {
 			// we might be in an incoherent state, so let's check with live clients to make sure
-			realSubscriptions, err := s.client.OperatorsV1alpha1().Subscriptions(csv.Namespace).List(ctx, metav1.ListOptions{})
+			realSubscriptions, err := s.listSubscriptions(ctx)
 			if err != nil {
 				return nil, fmt.Errorf("failed to list subscriptions: %w", err)
 			}

pkg/controller/registry/resolver/source_csvs_test.go

@@ -477,14 +477,24 @@ func TestPropertiesAnnotationHonored(t *testing.T) {
 		csvLister: fakeCSVLister{
 			&v1alpha1.ClusterServiceVersion{
 				ObjectMeta: metav1.ObjectMeta{
+					Namespace: "fake-ns",
+					Name:      "csv",
 					Annotations: map[string]string{
 						"operatorframework.io/properties": `{"properties":[{"type":"test-type","value":{"test":"value"}}]}`,
 					},
 				},
 			},
 		},
-		subLister: fakeSubscriptionLister{},
-		ogLister:  fakeOperatorGroupLister{og},
+		subLister: fakeSubscriptionLister{&v1alpha1.Subscription{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: "fake-ns",
+				Name:      "sub",
+			},
+			Status: v1alpha1.SubscriptionStatus{
+				InstalledCSV: "csv",
+			},
+		}},
+		ogLister: fakeOperatorGroupLister{og},
 	}
 	ss, err := src.Snapshot(context.Background())
 	require.NoError(t, err)

pkg/controller/registry/resolver/step_resolver_test.go

@@ -1,6 +1,7 @@
 package resolver
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"testing"
@@ -12,6 +13,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
@@ -1280,7 +1282,20 @@ func TestResolver(t *testing.T) {
 				csvLister: lister.OperatorsV1alpha1().ClusterServiceVersionLister().ClusterServiceVersions(namespace),
 				subLister: lister.OperatorsV1alpha1().SubscriptionLister().Subscriptions(namespace),
 				ogLister:  lister.OperatorsV1().OperatorGroupLister().OperatorGroups(namespace),
-				logger:    log,
+				listSubscriptions: func(ctx context.Context) (*v1alpha1.SubscriptionList, error) {
+					items, err := lister.OperatorsV1alpha1().SubscriptionLister().Subscriptions(namespace).List(labels.Everything())
+					if err != nil {
+						return nil, err
+					}
+					var out []v1alpha1.Subscription
+					for _, sub := range items {
+						out = append(out, *sub)
+					}
+					return &v1alpha1.SubscriptionList{
+						Items: out,
+					}, nil
+				},
+				logger: log,
 			}
 			satresolver := &Resolver{
 				cache: resolvercache.New(ssp),