From 91fd67196706112f7e2507f4ac9a9e81ad224793 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 30 Aug 2024 14:51:06 +0200 Subject: [PATCH] e2e/regression: move timeout closer to context usage Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- e2e/regression/regression_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/e2e/regression/regression_test.go b/e2e/regression/regression_test.go index 2c52a17983..38982e0c2f 100644 --- a/e2e/regression/regression_test.go +++ b/e2e/regression/regression_test.go @@ -60,8 +60,6 @@ func TestRegression(t *testing.T) { require := require.New(t) c := kubeclient.NewForTest(t) - ctx, cancel := context.WithTimeout(context.Background(), 3*time.Minute) // Already long timeout, not using ct.FactorPlatformTimeout. - defer cancel() yaml, err := os.ReadFile(yamlDir + file.Name()) require.NoError(err) @@ -82,8 +80,7 @@ func TestRegression(t *testing.T) { t.Cleanup(func() { // delete the deployment - ctx = context.Background() - require.NoError(ct.Kubeclient.Client.AppsV1().Deployments(ct.Namespace).Delete(ctx, deploymentName, metav1.DeleteOptions{})) + require.NoError(ct.Kubeclient.Client.AppsV1().Deployments(ct.Namespace).Delete(context.Background(), deploymentName, metav1.DeleteOptions{})) }) // generate, set, deploy and verify the new policy @@ -92,6 +89,8 @@ func TestRegression(t *testing.T) { require.True(t.Run("set", ct.Set), "contrast set needs to succeed for subsequent tests") require.True(t.Run("verify", ct.Verify), "contrast verify needs to succeed for subsequent tests") + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Minute) // Already long timeout, not using ct.FactorPlatformTimeout. + defer cancel() require.NoError(c.WaitFor(ctx, kubeclient.Deployment{}, ct.Namespace, deploymentName)) }) }