Skip to content

Commit 1620b73

Browse files
grokspawngrokspawn
committed
e2e fixes
Signed-off-by: Jordan Keister <[email protected]>
1 parent 8189015 commit 1620b73

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

‎test/e2e/cluster_extension_install_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -334,12 +334,12 @@ func TestClusterExtensionInstallRegistry(t *testing.T) {
334334
assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
335335
}, pollDuration, pollInterval)
336336

337-
t.Log("By eventually reporting no longer progressing")
337+
t.Log("By eventually reporting progressing as True")
338338
require.EventuallyWithT(t, func(ct *assert.CollectT) {
339339
assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
340340
cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeProgressing)
341341
if assert.NotNil(ct, cond) {
342-
assert.Equal(ct, metav1.ConditionFalse, cond.Status)
342+
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
343343
assert.Equal(ct, ocv1alpha1.ReasonSucceeded, cond.Reason)
344344
}
345345
}, pollDuration, pollInterval)
@@ -440,7 +440,7 @@ func TestClusterExtensionBlockInstallNonSuccessorVersion(t *testing.T) {
440440

441441
cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeProgressing)
442442
if assert.NotNil(ct, cond) {
443-
assert.Equal(ct, metav1.ConditionFalse, cond.Status)
443+
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
444444
assert.Equal(ct, ocv1alpha1.ReasonSucceeded, cond.Reason)
445445
}
446446
}, pollDuration, pollInterval)
@@ -496,7 +496,7 @@ func TestClusterExtensionForceInstallNonSuccessorVersion(t *testing.T) {
496496
assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
497497
cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeProgressing)
498498
if assert.NotNil(ct, cond) {
499-
assert.Equal(ct, metav1.ConditionFalse, cond.Status)
499+
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
500500
assert.Equal(ct, ocv1alpha1.ReasonSucceeded, cond.Reason)
501501
}
502502
}, pollDuration, pollInterval)
@@ -512,7 +512,7 @@ func TestClusterExtensionForceInstallNonSuccessorVersion(t *testing.T) {
512512
assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
513513
cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeProgressing)
514514
if assert.NotNil(ct, cond) {
515-
assert.Equal(ct, metav1.ConditionFalse, cond.Status)
515+
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
516516
assert.Equal(ct, ocv1alpha1.ReasonSucceeded, cond.Reason)
517517
}
518518
}, pollDuration, pollInterval)
@@ -547,7 +547,7 @@ func TestClusterExtensionInstallSuccessorVersion(t *testing.T) {
547547
assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
548548
cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeProgressing)
549549
if assert.NotNil(ct, cond) {
550-
assert.Equal(ct, metav1.ConditionFalse, cond.Status)
550+
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
551551
assert.Equal(ct, ocv1alpha1.ReasonSucceeded, cond.Reason)
552552
}
553553
}, pollDuration, pollInterval)
@@ -562,7 +562,7 @@ func TestClusterExtensionInstallSuccessorVersion(t *testing.T) {
562562
assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
563563
cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeProgressing)
564564
if assert.NotNil(ct, cond) {
565-
assert.Equal(ct, metav1.ConditionFalse, cond.Status)
565+
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
566566
assert.Equal(ct, ocv1alpha1.ReasonSucceeded, cond.Reason)
567567
}
568568
}, pollDuration, pollInterval)
@@ -607,7 +607,7 @@ func TestClusterExtensionInstallReResolvesWhenCatalogIsPatched(t *testing.T) {
607607
assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
608608
cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeProgressing)
609609
if assert.NotNil(ct, cond) {
610-
assert.Equal(ct, metav1.ConditionFalse, cond.Status)
610+
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
611611
assert.Equal(ct, ocv1alpha1.ReasonSucceeded, cond.Reason)
612612
}
613613
}, pollDuration, pollInterval)
@@ -631,7 +631,7 @@ func TestClusterExtensionInstallReResolvesWhenCatalogIsPatched(t *testing.T) {
631631
assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
632632
cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeProgressing)
633633
if assert.NotNil(ct, cond) {
634-
assert.Equal(ct, metav1.ConditionFalse, cond.Status)
634+
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
635635
assert.Equal(ct, ocv1alpha1.ReasonSucceeded, cond.Reason)
636636
}
637637
}, pollDuration, pollInterval)
@@ -690,7 +690,7 @@ func TestClusterExtensionInstallReResolvesWhenNewCatalog(t *testing.T) {
690690
assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
691691
cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeProgressing)
692692
if assert.NotNil(ct, cond) {
693-
assert.Equal(ct, metav1.ConditionFalse, cond.Status)
693+
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
694694
assert.Equal(ct, ocv1alpha1.ReasonSucceeded, cond.Reason)
695695
}
696696
}, pollDuration, pollInterval)
@@ -714,7 +714,7 @@ func TestClusterExtensionInstallReResolvesWhenNewCatalog(t *testing.T) {
714714
assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
715715
cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeProgressing)
716716
if assert.NotNil(ct, cond) {
717-
assert.Equal(ct, metav1.ConditionFalse, cond.Status)
717+
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
718718
assert.Equal(ct, ocv1alpha1.ReasonSucceeded, cond.Reason)
719719
}
720720
}, pollDuration, pollInterval)
@@ -858,12 +858,12 @@ func TestClusterExtensionRecoversFromInitialInstallFailedWhenFailureFixed(t *tes
858858
}
859859
}, pollDuration, pollInterval)
860860

861-
t.Log("By eventually reporting Progressing == False with Reason Success")
861+
t.Log("By eventually reporting Progressing == True with Reason Success")
862862
require.EventuallyWithT(t, func(ct *assert.CollectT) {
863863
assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
864864
cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeProgressing)
865865
if assert.NotNil(ct, cond) {
866-
assert.Equal(ct, metav1.ConditionFalse, cond.Status)
866+
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
867867
assert.Equal(ct, ocv1alpha1.ReasonSucceeded, cond.Reason)
868868
}
869869
}, pollDuration, pollInterval)

0 commit comments

Comments
 (0)