fix condition

Signed-off-by: YZ775 <yuzuki-mimura@cybozu.co.jp>
cybozu-go · Aug 23, 2023 · fff0b16 · fff0b16
1 parent 100f201
commit fff0b16
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/e2e/lifecycle_test.go b/e2e/lifecycle_test.go
@@ -49,7 +49,13 @@ var _ = Context("lifecycle", func() {
 			if conditionHealthy == nil {
 				return fmt.Errorf("cluster is not healthy")
 			}
-			if conditionReconcileSuccess.Status != metav1.ConditionTrue && conditionStatefulSetReady.Status != metav1.ConditionTrue && conditionHealthy.Status != metav1.ConditionTrue {
+			if conditionReconcileSuccess.Status != metav1.ConditionTrue {
+				return fmt.Errorf("cluster is not ready")
+			}
+			if conditionStatefulSetReady.Status != metav1.ConditionTrue {
+				return fmt.Errorf("cluster is not ready")
+			}
+			if conditionHealthy.Status != metav1.ConditionTrue {
 				return fmt.Errorf("cluster is not ready")
 			}
 			return nil

diff --git a/e2e/upgrade_test.go b/e2e/upgrade_test.go
@@ -153,7 +153,13 @@ var _ = Context("upgrade", func() {
 			if conditionHealthy == nil {
 				return fmt.Errorf("cluster is not healthy")
 			}
-			if conditionReconcileSuccess.Status != metav1.ConditionTrue && conditionStatefulSetReady.Status != metav1.ConditionTrue && conditionHealthy.Status != metav1.ConditionTrue {
+			if conditionReconcileSuccess.Status != metav1.ConditionTrue {
+				return fmt.Errorf("cluster is not ready")
+			}
+			if conditionStatefulSetReady.Status != metav1.ConditionTrue {
+				return fmt.Errorf("cluster is not ready")
+			}
+			if conditionHealthy.Status != metav1.ConditionTrue {
 				return fmt.Errorf("cluster is not ready")
 			}
 			return nil