Skip to content

Commit 100c39e

Browse files
committed
review comments
Signed-off-by: rashmi_kh <[email protected]>
1 parent 452703d commit 100c39e

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

internal/controllers/clusterextension_controller_test.go

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ func TestClusterExtensionInstallationFailsWithNoServiceAccount(t *testing.T) {
695695
pkgVer := "1.0.0"
696696
pkgChan := "beta"
697697
namespace := fmt.Sprintf("test-ns-%s", rand.String(8))
698-
serviceAccount := fmt.Sprintf("test-does-not-exist-%s", rand.String(8))
698+
serviceAccount := fmt.Sprintf("test-does1-not-exist-%s", rand.String(8))
699699

700700
clusterExtension := &ocv1.ClusterExtension{
701701
ObjectMeta: metav1.ObjectMeta{Name: extKey.Name},
@@ -742,28 +742,20 @@ func TestClusterExtensionInstallationFailsWithNoServiceAccount(t *testing.T) {
742742

743743
t.Log("By checking the status fields")
744744
require.Equal(t, ocv1.BundleMetadata{Name: "prometheus.v1.0.0", Version: "1.0.0"}, clusterExtension.Status.Install.Bundle)
745+
res, err = reconciler.Reconcile(ctx, ctrl.Request{NamespacedName: extKey})
746+
require.Error(t, err, res)
745747

746748
t.Log("By checking the expected installed conditions")
747-
748749
installedCond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1.TypeInstalled)
749-
t.Log("By checking the installed conditions message", installedCond.Message)
750750
require.NotNil(t, installedCond)
751-
t.Log("By checking the installed conditions status", installedCond.Status)
752-
t.Log("By checking the installed conditions reason", installedCond.Reason)
753751
require.Equal(t, metav1.ConditionTrue, installedCond.Status)
754752
require.Equal(t, ocv1.ReasonSucceeded, installedCond.Reason)
755753

756754
t.Log("By checking the expected progressing conditions")
757755
progressingCond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1.TypeProgressing)
758-
t.Log("Progressing condition message", progressingCond.Message)
759756
require.NotNil(t, progressingCond)
760-
t.Log("Progressing condition status", progressingCond.Status)
761-
t.Log("Progressing condition reason", progressingCond.Reason)
762-
//require.Equal(t, metav1.ConditionTrue, progressingCond.Status)
763-
require.Equal(t, ocv1.ReasonFailed, progressingCond.Reason)
764-
failedCond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1.ReasonFailed)
765-
t.Log("By checking the failed conditions message", failedCond.Message)
766-
t.Log("By checking the failed conditions status", failedCond.Status, failedCond.Reason)
757+
require.Equal(t, metav1.ConditionTrue, progressingCond.Status)
758+
require.Equal(t, ocv1.ReasonSucceeded, progressingCond.Reason)
767759

768760
require.NoError(t, cl.DeleteAllOf(ctx, &ocv1.ClusterExtension{}))
769761
}

0 commit comments

Comments
 (0)