From e75d308b9cfc86e6e3ace54e2a6ccc7ad901f41c Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 22 Jul 2021 09:48:38 +0200 Subject: [PATCH] e2e: isRetryableAPIError() should match any etcdserver timeout framework.RunKubectl() returns an error that does not end with "etcdserver: request timed out", but contains the text somewhere in the middle: error running /usr/bin/kubectl --server=https://192.168.39.57:8443 --kubeconfig=/root/.kube/config --namespace=cephcsi-e2e-a44ec4b4 create -f -: Command stdout: stderr: Error from server: error when creating "STDIN": etcdserver: request timed out error: exit status 1 isRetryableAPIError() should return `true` for this case as well, so instead of using HasSuffix(), we'll use Contains(). Signed-off-by: Niels de Vos --- e2e/errors.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/errors.go b/e2e/errors.go index ca402082a..eb14696a7 100644 --- a/e2e/errors.go +++ b/e2e/errors.go @@ -37,7 +37,7 @@ func isRetryableAPIError(err error) bool { } // "etcdserver: request timed out" does not seem to match the timeout errors above - if strings.HasSuffix(err.Error(), "etcdserver: request timed out") { + if strings.Contains(err.Error(), "etcdserver: request timed out") { return true }