e2e: adjust context handling in various tests

Author: charludo

e2e/containerd-11644-reproducer/containerd-11644-reproducer_test.go

@@ -36,11 +36,11 @@ func TestContainerd11644Reproducer(t *testing.T) {
 
 	deploymentName := "containerd-11644-reproducer"
 	runcTester, ccTester := kuberesource.Containerd11644ReproducerTesters(deploymentName)
-	ctx, cancel := context.WithTimeout(t.Context(), 2*time.Minute)
-	t.Cleanup(cancel)
 
 	// Start the runcTester outside the CC context.
 	ct.Init(t, []any{runcTester})
+	ctx, cancel := context.WithTimeout(t.Context(), ct.FactorPlatformTimeout(2*time.Minute))
+	t.Cleanup(cancel)
 	_, err = ct.Kubeclient.Client.AppsV1().
 		Deployments(ct.Namespace).
 		Apply(
@@ -67,6 +67,8 @@ func TestContainerd11644Reproducer(t *testing.T) {
 	require.True(t, t.Run("set", ct.Set), "contrast set needs to succeed for subsequent tests")
 	require.True(t, t.Run("contrast verify", ct.Verify), "contrast verify needs to succeed for subsequent tests")
 
+	ctx, cancel = context.WithTimeout(t.Context(), ct.FactorPlatformTimeout(2*time.Minute))
+	t.Cleanup(cancel)
 	err = ct.Kubeclient.WaitForDeployment(ctx, ct.Namespace, *ccTester.Name)
 	require.NoError(t, err)
 }

e2e/imagestore/imagestore_test.go

@@ -71,11 +71,14 @@ func TestImageStore(t *testing.T) {
 	require.True(t.Run("contrast verify", ct.Verify), "contrast verify needs to succeed for subsequent tests")
 
 	ctx, cancel := context.WithTimeout(t.Context(), ct.FactorPlatformTimeout(2*time.Minute))
-	defer cancel()
+	t.Cleanup(cancel)
 	require.NoError(ct.Kubeclient.WaitForStatefulSet(ctx, ct.Namespace, "coordinator"))
 
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
+			ctx, cancel := context.WithTimeout(t.Context(), ct.FactorPlatformTimeout(2*time.Minute))
+			t.Cleanup(cancel)
+
 			require = req.New(t)
 			require.NoError(ct.Kubeclient.WaitForPod(ctx, ct.Namespace, tc.name))
 

e2e/servicemesh/servicemesh_test.go

@@ -60,7 +60,7 @@ func TestIngressEgress(t *testing.T) {
 	require.True(t, t.Run("deployments become available", func(t *testing.T) {
 		require := require.New(t)
 
-		ctx, cancel := context.WithTimeout(t.Context(), ct.FactorPlatformTimeout(1*time.Minute))
+		ctx, cancel := context.WithTimeout(t.Context(), ct.FactorPlatformTimeout(2*time.Minute))
 		defer cancel()
 
 		require.NoError(ct.Kubeclient.WaitForDeployment(ctx, ct.Namespace, "vote-bot"))

e2e/volumestatefulset/volumestatefulset_test.go

@@ -53,7 +53,7 @@ func TestVolumeStatefulSet(t *testing.T) {
 	require.True(t, t.Run("deployments become available", func(t *testing.T) {
 		require := require.New(t)
 
-		ctx, cancel := context.WithTimeout(t.Context(), ct.FactorPlatformTimeout(1*time.Minute))
+		ctx, cancel := context.WithTimeout(t.Context(), ct.FactorPlatformTimeout(2*time.Minute))
 		defer cancel()
 
 		require.NoError(ct.Kubeclient.WaitForStatefulSet(ctx, ct.Namespace, "volume-tester"))

e2e/workloadsecret/workloadsecret_test.go

@@ -57,7 +57,7 @@ func TestWorkloadSecrets(t *testing.T) {
 	require.True(t, t.Run("deployments become available", func(t *testing.T) {
 		require := require.New(t)
 
-		ctx, cancel := context.WithTimeout(t.Context(), ct.FactorPlatformTimeout(1*time.Minute))
+		ctx, cancel := context.WithTimeout(t.Context(), ct.FactorPlatformTimeout(2*time.Minute))
 		defer cancel()
 
 		require.NoError(ct.Kubeclient.WaitForDeployment(ctx, ct.Namespace, "vote-bot"))