Unskip all - failing tests (up|down)grade should err

Unskips all in clusterextension_controller_test.go

Signed-off-by: Brett Tofel <[email protected]>

Author: bentito

internal/controllers/clusterextension_controller_test.go

@@ -128,65 +128,6 @@ func TestClusterExtensionNonExistentVersion(t *testing.T) {
 	require.NoError(t, cl.DeleteAllOf(ctx, &ocv1alpha1.ClusterExtension{}))
 }
 
-func TestClusterExtensionBundleDeploymentDoesNotExist(t *testing.T) {
-	t.Skip("Skip and replace with e2e for BundleDeployment")
-	cl, reconciler := newClientAndReconciler(t)
-	ctx := context.Background()
-	extKey := types.NamespacedName{Name: fmt.Sprintf("cluster-extension-test-%s", rand.String(8))}
-	const pkgName = "prometheus"
-	installNamespace := fmt.Sprintf("test-ns-%s", rand.String(8))
-
-	t.Log("When the cluster extension specifies a valid available package")
-	t.Log("By initializing cluster state")
-	clusterExtension := &ocv1alpha1.ClusterExtension{
-		ObjectMeta: metav1.ObjectMeta{Name: extKey.Name},
-		Spec: ocv1alpha1.ClusterExtensionSpec{
-			PackageName:      pkgName,
-			InstallNamespace: installNamespace,
-		},
-	}
-	require.NoError(t, cl.Create(ctx, clusterExtension))
-
-	t.Log("When the BundleDeployment does not exist")
-	t.Log("By running reconcile")
-	res, err := reconciler.Reconcile(ctx, ctrl.Request{NamespacedName: extKey})
-	require.Equal(t, ctrl.Result{}, res)
-	require.NoError(t, err)
-
-	t.Log("By fetching updated cluster extension after reconcile")
-	require.NoError(t, cl.Get(ctx, extKey, clusterExtension))
-
-	t.Log("It results in the expected BundleDeployment")
-	bd := &rukpakv1alpha2.BundleDeployment{}
-	require.NoError(t, cl.Get(ctx, types.NamespacedName{Name: extKey.Name}, bd))
-	require.Equal(t, "core-rukpak-io-registry", bd.Spec.ProvisionerClassName)
-	require.Equal(t, installNamespace, bd.Spec.InstallNamespace)
-	require.NotNil(t, bd.Spec.Source.Image)
-	require.Equal(t, "quay.io/operatorhubio/[email protected]", bd.Spec.Source.Image.Ref)
-
-	t.Log("It sets the ResolvedBundle status field")
-	require.Equal(t, &ocv1alpha1.BundleMetadata{Name: "operatorhub/prometheus/beta/2.0.0", Version: "2.0.0"}, clusterExtension.Status.ResolvedBundle)
-
-	t.Log("It sets the InstalledBundle status field")
-	require.Empty(t, clusterExtension.Status.InstalledBundle)
-
-	t.Log("It sets the status on the cluster extension")
-	cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeResolved)
-	require.NotNil(t, cond)
-	require.Equal(t, metav1.ConditionTrue, cond.Status)
-	require.Equal(t, ocv1alpha1.ReasonSuccess, cond.Reason)
-	require.Equal(t, "resolved to \"quay.io/operatorhubio/[email protected]\"", cond.Message)
-
-	cond = apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeInstalled)
-	require.NotNil(t, cond)
-	require.Equal(t, metav1.ConditionUnknown, cond.Status)
-	require.Equal(t, ocv1alpha1.ReasonInstallationStatusUnknown, cond.Reason)
-	require.Equal(t, "bundledeployment status is unknown", cond.Message)
-
-	verifyInvariants(ctx, t, reconciler.Client, clusterExtension)
-	require.NoError(t, cl.DeleteAllOf(ctx, &ocv1alpha1.ClusterExtension{}))
-}
-
 func TestClusterExtensionChannelVersionExists(t *testing.T) {
 	cl, reconciler := newClientAndReconciler(t)
 	mockUnpacker := unpacker.(*MockUnpacker)
@@ -221,7 +162,7 @@ func TestClusterExtensionChannelVersionExists(t *testing.T) {
 	t.Log("By running reconcile")
 	res, err := reconciler.Reconcile(ctx, ctrl.Request{NamespacedName: extKey})
 	require.Equal(t, ctrl.Result{}, res)
-	require.NoError(t, err, nil)
+	require.NoError(t, err)
 
 	t.Log("By fetching updated cluster extension after reconcile")
 	require.NoError(t, cl.Get(ctx, extKey, clusterExtension))
@@ -247,8 +188,13 @@ func TestClusterExtensionChannelVersionExists(t *testing.T) {
 }
 
 func TestClusterExtensionChannelExistsNoVersion(t *testing.T) {
-	t.Skip("Skip and replace with e2e for BundleDeployment")
 	cl, reconciler := newClientAndReconciler(t)
+	mockUnpacker := unpacker.(*MockUnpacker)
+	// Set up the Unpack method to return a result with StateUnpacked
+	mockUnpacker.On("Unpack", mock.Anything, mock.AnythingOfType("*v1alpha2.BundleDeployment")).Return(&source.Result{
+		State: source.StatePending,
+	}, nil)
+
 	ctx := context.Background()
 	extKey := types.NamespacedName{Name: fmt.Sprintf("cluster-extension-test-%s", rand.String(8))}
 
@@ -267,13 +213,15 @@ func TestClusterExtensionChannelExistsNoVersion(t *testing.T) {
 			InstallNamespace: installNamespace,
 		},
 	}
-	require.NoError(t, cl.Create(ctx, clusterExtension))
+	err := cl.Create(ctx, clusterExtension)
+	require.NoError(t, err)
 
 	t.Log("It sets resolution success status")
 	t.Log("By running reconcile")
 	res, err := reconciler.Reconcile(ctx, ctrl.Request{NamespacedName: extKey})
 	require.Equal(t, ctrl.Result{}, res)
 	require.NoError(t, err)
+
 	t.Log("By fetching updated cluster extension after reconcile")
 	require.NoError(t, cl.Get(ctx, extKey, clusterExtension))
 
@@ -282,27 +230,18 @@ func TestClusterExtensionChannelExistsNoVersion(t *testing.T) {
 	require.Empty(t, clusterExtension.Status.InstalledBundle)
 
 	t.Log("By checking the expected conditions")
-	cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeResolved)
-	require.NotNil(t, cond)
-	require.Equal(t, metav1.ConditionTrue, cond.Status)
-	require.Equal(t, ocv1alpha1.ReasonSuccess, cond.Reason)
-	require.Equal(t, "resolved to \"quay.io/operatorhubio/[email protected]\"", cond.Message)
-	cond = apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeInstalled)
-	require.NotNil(t, cond)
-	require.Equal(t, metav1.ConditionUnknown, cond.Status)
-	require.Equal(t, ocv1alpha1.ReasonInstallationStatusUnknown, cond.Reason)
-	require.Equal(t, "bundledeployment status is unknown", cond.Message)
+	resolvedCond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeResolved)
+	require.NotNil(t, resolvedCond)
+	require.Equal(t, metav1.ConditionTrue, resolvedCond.Status)
+	require.Equal(t, ocv1alpha1.ReasonSuccess, resolvedCond.Reason)
+	require.Equal(t, "resolved to \"quay.io/operatorhubio/[email protected]\"", resolvedCond.Message)
 
-	t.Log("By fetching the bundledeployment")
-	bd := &rukpakv1alpha2.BundleDeployment{}
-	require.NoError(t, cl.Get(ctx, types.NamespacedName{Name: extKey.Name}, bd))
-	require.Equal(t, "core-rukpak-io-registry", bd.Spec.ProvisionerClassName)
-	require.Equal(t, installNamespace, bd.Spec.InstallNamespace)
-	require.Equal(t, rukpakv1alpha2.SourceTypeImage, bd.Spec.Source.Type)
-	require.NotNil(t, bd.Spec.Source.Image)
-	require.Equal(t, "quay.io/operatorhubio/[email protected]", bd.Spec.Source.Image.Ref)
+	t.Log("By checking the expected unpacked conditions")
+	unpackedCond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, rukpakv1alpha2.TypeUnpacked)
+	require.NotNil(t, unpackedCond)
+	require.Equal(t, metav1.ConditionFalse, unpackedCond.Status)
+	require.Equal(t, rukpakv1alpha2.ReasonUnpackPending, unpackedCond.Reason)
 
-	verifyInvariants(ctx, t, reconciler.Client, clusterExtension)
 	require.NoError(t, cl.DeleteAllOf(ctx, &ocv1alpha1.ClusterExtension{}))
 }
 
@@ -476,10 +415,14 @@ func verifyConditionsInvariants(t *testing.T, ext *ocv1alpha1.ClusterExtension)
 
 func TestClusterExtensionUpgrade(t *testing.T) {
 	cl, reconciler := newClientAndReconciler(t)
+	mockUnpacker := unpacker.(*MockUnpacker)
+	// Set up the Unpack method to return a result with StateUnpacked
+	mockUnpacker.On("Unpack", mock.Anything, mock.AnythingOfType("*v1alpha2.BundleDeployment")).Return(&source.Result{
+		State: source.StatePending,
+	}, nil)
 	ctx := context.Background()
 
 	t.Run("semver upgrade constraints enforcement of upgrades within major version", func(t *testing.T) {
-		t.Skip("Skip and replace with e2e for BundleDeployment")
 		defer featuregatetesting.SetFeatureGateDuringTest(t, features.OperatorControllerFeatureGate, features.ForceSemverUpgradeConstraints, true)()
 		defer func() {
 			require.NoError(t, cl.DeleteAllOf(ctx, &ocv1alpha1.ClusterExtension{}))
@@ -573,7 +516,6 @@ func TestClusterExtensionUpgrade(t *testing.T) {
 	})
 
 	t.Run("legacy semantics upgrade constraints enforcement", func(t *testing.T) {
-		t.Skip("Skip and replace with e2e for BundleDeployment")
 		defer featuregatetesting.SetFeatureGateDuringTest(t, features.OperatorControllerFeatureGate, features.ForceSemverUpgradeConstraints, false)()
 		defer func() {
 			require.NoError(t, cl.DeleteAllOf(ctx, &ocv1alpha1.ClusterExtension{}))
@@ -667,7 +609,6 @@ func TestClusterExtensionUpgrade(t *testing.T) {
 	})
 
 	t.Run("ignore upgrade constraints", func(t *testing.T) {
-		t.Skip("Skip and replace with e2e for BundleDeployment")
 		for _, tt := range []struct {
 			name      string
 			flagState bool
@@ -754,10 +695,14 @@ func TestClusterExtensionUpgrade(t *testing.T) {
 
 func TestClusterExtensionDowngrade(t *testing.T) {
 	cl, reconciler := newClientAndReconciler(t)
+	mockUnpacker := unpacker.(*MockUnpacker)
+	// Set up the Unpack method to return a result with StateUnpacked
+	mockUnpacker.On("Unpack", mock.Anything, mock.AnythingOfType("*v1alpha2.BundleDeployment")).Return(&source.Result{
+		State: source.StatePending,
+	}, nil)
 	ctx := context.Background()
 
 	t.Run("enforce upgrade constraints", func(t *testing.T) {
-		t.Skip("Skip and replace with e2e for BundleDeployment")
 		for _, tt := range []struct {
 			name      string
 			flagState bool
@@ -840,7 +785,6 @@ func TestClusterExtensionDowngrade(t *testing.T) {
 	})
 
 	t.Run("ignore upgrade constraints", func(t *testing.T) {
-		t.Skip("Skip and replace with e2e for BundleDeployment")
 		for _, tt := range []struct {
 			name      string
 			flagState bool