From ba2ac5777251c623a0f47493fed8005d8f0dd283 Mon Sep 17 00:00:00 2001 From: Andrea Mazzotti Date: Fri, 13 Dec 2024 12:29:53 +0100 Subject: [PATCH] Increase timeout when waiting for reconciler Signed-off-by: Andrea Mazzotti --- .../capiprovider_controller_test.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/controllers/capiprovider_controller_test.go b/internal/controllers/capiprovider_controller_test.go index a7fd9d32..423a538b 100644 --- a/internal/controllers/capiprovider_controller_test.go +++ b/internal/controllers/capiprovider_controller_test.go @@ -70,8 +70,8 @@ var _ = Describe("Reconcile CAPIProvider", func() { dockerProvider := objectFromKey(client.ObjectKeyFromObject(provider), &operatorv1.InfrastructureProvider{}) dockerSecret := objectFromKey(client.ObjectKeyFromObject(provider), &corev1.Secret{}) - Eventually(Object(dockerProvider)).ShouldNot(BeNil()) - Eventually(Object(dockerSecret)).Should(HaveField("Data", Equal(map[string][]byte{ + Eventually(Object(dockerProvider)).WithTimeout(5 * time.Second).ShouldNot(BeNil()) + Eventually(Object(dockerSecret)).WithTimeout(5 * time.Second).Should(HaveField("Data", Equal(map[string][]byte{ "CLUSTER_TOPOLOGY": []byte("true"), "EXP_CLUSTER_RESOURCE_SET": []byte("true"), "EXP_MACHINE_POOL": []byte("true"), @@ -87,7 +87,7 @@ var _ = Describe("Reconcile CAPIProvider", func() { }} Expect(cl.Create(ctx, provider)).ToNot(HaveOccurred()) - Eventually(Object(provider)).Should( + Eventually(Object(provider)).WithTimeout(5 * time.Second).Should( HaveField("Status.Name", Equal(provider.Name))) }) @@ -101,7 +101,7 @@ var _ = Describe("Reconcile CAPIProvider", func() { }} Expect(cl.Create(ctx, provider)).ToNot(HaveOccurred()) - Eventually(Object(provider)).Should( + Eventually(Object(provider)).WithTimeout(5 * time.Second).Should( HaveField("Status.Name", Equal(provider.Spec.Name))) }) @@ -116,8 +116,8 @@ var _ = Describe("Reconcile CAPIProvider", func() { dockerProvider := objectFromKey(client.ObjectKeyFromObject(provider), &operatorv1.InfrastructureProvider{}) dockerSecret := objectFromKey(client.ObjectKeyFromObject(provider), &corev1.Secret{}) - Eventually(Object(dockerProvider)).ShouldNot(BeNil()) - Eventually(Object(dockerSecret)).ShouldNot(BeNil()) + Eventually(Object(dockerProvider)).WithTimeout(5 * time.Second).ShouldNot(BeNil()) + Eventually(Object(dockerSecret)).WithTimeout(5 * time.Second).ShouldNot(BeNil()) Eventually(Update(provider, func() { provider.Spec.Version = "v1.2.3" @@ -126,8 +126,8 @@ var _ = Describe("Reconcile CAPIProvider", func() { } })).Should(Succeed()) - Eventually(Object(dockerProvider)).Should(HaveField("Spec.Version", Equal("v1.2.3"))) - Eventually(Object(dockerSecret)).Should(HaveField("Data", Equal(map[string][]byte{ + Eventually(Object(dockerProvider)).WithTimeout(5 * time.Second).Should(HaveField("Spec.Version", Equal("v1.2.3"))) + Eventually(Object(dockerSecret)).WithTimeout(5 * time.Second).Should(HaveField("Data", Equal(map[string][]byte{ "other": []byte("var"), "CLUSTER_TOPOLOGY": []byte("true"), "EXP_CLUSTER_RESOURCE_SET": []byte("true"), @@ -177,7 +177,7 @@ var _ = Describe("Reconcile CAPIProvider", func() { } })).Should(Succeed()) - Eventually(Object(doSecret)).Should(HaveField("Data", Equal(map[string][]byte{ + Eventually(Object(doSecret)).WithTimeout(5 * time.Second).Should(HaveField("Data", Equal(map[string][]byte{ "EXP_MACHINE_POOL": []byte("true"), "CLUSTER_TOPOLOGY": []byte("false"), "EXP_CLUSTER_RESOURCE_SET": []byte("false"),