diff --git a/test/e2e/far_e2e_test.go b/test/e2e/far_e2e_test.go index 6d7bb25e..fe740a5a 100644 --- a/test/e2e/far_e2e_test.go +++ b/test/e2e/far_e2e_test.go @@ -41,8 +41,9 @@ const ( //TODO: try to minimize timeout // eventually parameters timeoutLogs = "3m0s" + timeoutTaint = "2s" // this timeout is used for checking the FAR taint timeoutReboot = "6m0s" // fencing with fence_aws should be completed within 6 minutes - timeoutShort = "5s" // this timeout is used after all the other steps have been succesfult + timeoutAfterReboot = "5s" // this timeout is used after all the other steps have been successful pollShort = "250ms" pollInterval = "1s" ) @@ -297,7 +298,7 @@ func wasFarTaintAdded(nodeName string) { node, err = utils.GetNodeWithName(k8sClient, nodeName) g.Expect(err).ToNot(HaveOccurred()) return utils.TaintExists(node.Spec.Taints, &farTaint) - }, timeoutShort, pollShort).Should(BeTrue()) + }, timeoutTaint, pollShort).Should(BeTrue()) log.Info("FAR taint was added", "node name", node.Name, "taint key", farTaint.Key, "taint effect", farTaint.Effect) } @@ -392,7 +393,7 @@ func checkPodDeleted(pod *corev1.Pod) { newPod := &corev1.Pod{} err := k8sClient.Get(context.Background(), client.ObjectKeyFromObject(pod), newPod) return apiErrors.IsNotFound(err) - }, timeoutShort, pollShort).Should(BeTrue()) + }, timeoutAfterReboot, pollShort).Should(BeTrue()) log.Info("Pod has already been deleted", "pod name", pod.Name) } @@ -409,7 +410,7 @@ func verifyStatusCondition(nodeName, conditionType string, conditionStatus *meta g.Expect(condition).ToNot(BeNil(), "expected condition %v to be set", conditionType) g.Expect(condition.Status).To(Equal(*conditionStatus), "expected condition %v to have status %v", conditionType, *conditionStatus) } - }, timeoutShort, pollShort).Should(Succeed()) + }, timeoutAfterReboot, pollShort).Should(Succeed()) } // checkRemediation verify whether the node was remediated