test/*: de-duplicate value timeout, retryInterval

timeout and retryInterval were same for most of the components and was duplicated. closes: #502 Signed-off-by: knrt10 <kautilya@kinvolk.io>
kinvolk · Oct 7, 2020 · 85fd4b8 · 85fd4b8
1 parent c01551a
commit 85fd4b8
Show file tree

Hide file tree

Showing 28 changed files with 51 additions and 91 deletions.
diff --git a/test/calico/metadata_access_test.go b/test/calico/metadata_access_test.go
@@ -54,7 +54,6 @@ spec:
 `
 
 	retryInterval = 1 * time.Second
-	timeout       = 5 * time.Minute
 )
 
 func TestNoMetadataAccessRandomPod(t *testing.T) { //nolint:funlen
@@ -99,7 +98,7 @@ func TestNoMetadataAccessRandomPod(t *testing.T) { //nolint:funlen
 	podsclient := client.Pods(ns.ObjectMeta.Name)
 
 	// Retry pod creation. This might fail if Linkerd is not ready yet and some requests might fail.
-	if err := wait.PollImmediate(retryInterval, timeout, func() (done bool, err error) {
+	if err := wait.PollImmediate(retryInterval, testutil.Timeout, func() (done bool, err error) {
 		p, err = podsclient.Create(context.TODO(), p, metav1.CreateOptions{})
 		if err != nil {
 			t.Logf("retrying pod creation, failed with: %v", err)
@@ -114,7 +113,7 @@ func TestNoMetadataAccessRandomPod(t *testing.T) { //nolint:funlen
 
 	phase := corev1.PodUnknown
 
-	if err := wait.PollImmediate(retryInterval, timeout, func() (done bool, err error) {
+	if err := wait.PollImmediate(retryInterval, testutil.Timeout, func() (done bool, err error) {
 		p, err := podsclient.Get(context.TODO(), p.ObjectMeta.Name, metav1.GetOptions{})
 		if err != nil {
 			return false, err

diff --git a/test/components/aws-ebs-csi-driver/aws-ebs-csi-driver_test.go b/test/components/aws-ebs-csi-driver/aws-ebs-csi-driver_test.go
@@ -21,7 +21,6 @@ package awsebscsidriver
 import (
 	"fmt"
 	"testing"
-	"time"
 
 	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
@@ -43,7 +42,7 @@ func TestCSIDriverDeployments(t *testing.T) {
 		test := test
 		t.Run(fmt.Sprintf("aws-ebs-csi-driver deployment:%s", test.deployment), func(t *testing.T) {
 			t.Parallel()
-			testutil.WaitForDeployment(t, client, namespace, test.deployment, time.Second*5, time.Minute*5)
+			testutil.WaitForDeployment(t, client, namespace, test.deployment, testutil.RetryInterval, testutil.Timeout)
 		})
 	}
 }
diff --git a/test/components/cert-manager/cert-manager_test.go b/test/components/cert-manager/cert-manager_test.go
@@ -20,7 +20,6 @@ package certmanager
 import (
 	"fmt"
 	"testing"
-	"time"
 
 	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
@@ -47,7 +46,7 @@ func TestCertManagerDeployments(t *testing.T) {
 	for _, test := range testCases {
 		t.Run(fmt.Sprintf("cert-manager deployment:%s", test.deployment), func(t *testing.T) {
 			t.Parallel()
-			testutil.WaitForDeployment(t, client, namespace, test.deployment, time.Second*5, time.Minute*5)
+			testutil.WaitForDeployment(t, client, namespace, test.deployment, testutil.RetryInterval, testutil.Timeout) //nolint:goscope
 		})
 	}
 }
diff --git a/test/components/cluster-autoscaler/cluster-autoscaler_test.go b/test/components/cluster-autoscaler/cluster-autoscaler_test.go
@@ -19,15 +19,12 @@ package clusterautoscaler
 
 import (
 	"testing"
-	"time"
 
 	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
 
 const (
-	defaultDeploymentTimeout       = 5 * time.Minute
-	defaultDeploymentProbeInterval = 5 * time.Second
-	name                           = "cluster-autoscaler-packet-cluster-autoscaler-chart"
+	name = "cluster-autoscaler-packet-cluster-autoscaler-chart"
 )
 
 func TestClusterAutoscalerDeployments(t *testing.T) {
@@ -36,6 +33,6 @@ func TestClusterAutoscalerDeployments(t *testing.T) {
 	t.Run("deployment", func(t *testing.T) {
 		t.Parallel()
 
-		testutil.WaitForDeployment(t, client, "kube-system", name, defaultDeploymentProbeInterval, defaultDeploymentTimeout)
+		testutil.WaitForDeployment(t, client, "kube-system", name, testutil.RetryInterval, testutil.Timeout)
 	})
 }
diff --git a/test/components/contour/contour_test.go b/test/components/contour/contour_test.go
@@ -19,7 +19,6 @@ package contour
 
 import (
 	"testing"
-	"time"
 
 	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
@@ -31,7 +30,7 @@ func TestEnvoyDaemonset(t *testing.T) {
 
 	client := testutil.CreateKubeClient(t)
 
-	testutil.WaitForDaemonSet(t, client, namespace, daemonset, time.Second*5, time.Minute*5)
+	testutil.WaitForDaemonSet(t, client, namespace, daemonset, testutil.RetryInterval, testutil.Timeout)
 }
 
 func TestContourDeployment(t *testing.T) {
@@ -41,5 +40,5 @@ func TestContourDeployment(t *testing.T) {
 
 	client := testutil.CreateKubeClient(t)
 
-	testutil.WaitForDeployment(t, client, namespace, deployment, time.Second*5, time.Minute*5)
+	testutil.WaitForDeployment(t, client, namespace, deployment, testutil.RetryInterval, testutil.Timeout)
 }
diff --git a/test/components/coredns/coredns_test.go b/test/components/coredns/coredns_test.go
@@ -19,7 +19,6 @@ package coredns
 
 import (
 	"testing"
-	"time"
 
 	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
@@ -31,5 +30,5 @@ func TestCoreDNSDeployment(t *testing.T) {
 
 	client := testutil.CreateKubeClient(t)
 
-	testutil.WaitForDeployment(t, client, namespace, deployment, time.Second*5, time.Minute*5)
+	testutil.WaitForDeployment(t, client, namespace, deployment, testutil.RetryInterval, testutil.Timeout)
 }
diff --git a/test/components/dex/dex_test.go b/test/components/dex/dex_test.go
@@ -19,7 +19,6 @@ package dex
 
 import (
 	"testing"
-	"time"
 
 	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
@@ -33,6 +32,6 @@ func TestDexDeployment(t *testing.T) {
 		t.Parallel()
 		deployment := "dex"
 
-		testutil.WaitForDeployment(t, client, namespace, deployment, time.Second*5, time.Minute*5)
+		testutil.WaitForDeployment(t, client, namespace, deployment, testutil.RetryInterval, testutil.Timeout)
 	})
 }
diff --git a/test/components/external-dns/external-dns_test.go b/test/components/external-dns/external-dns_test.go
@@ -19,9 +19,9 @@ package externaldns
 
 import (
 	"fmt"
-	testutil "github.com/kinvolk/lokomotive/test/components/util"
 	"testing"
-	"time"
+
+	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
 
 const namespace = "external-dns"
@@ -32,6 +32,6 @@ func TestExternalDNSDeployments(t *testing.T) {
 	t.Run(fmt.Sprintf("deployment"), func(t *testing.T) {
 		t.Parallel()
 		deployment := "external-dns"
-		testutil.WaitForDeployment(t, client, namespace, deployment, time.Second*5, time.Minute*5)
+		testutil.WaitForDeployment(t, client, namespace, deployment, testutil.RetryInterval, testutil.Timeout)
 	})
 }
diff --git a/test/components/flatcar-linux-update-operator/fluo_test.go b/test/components/flatcar-linux-update-operator/fluo_test.go
@@ -19,7 +19,6 @@ package fluo
 
 import (
 	"testing"
-	"time"
 
 	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
@@ -31,7 +30,7 @@ func TestUpdateAgentDaemonset(t *testing.T) {
 
 	client := testutil.CreateKubeClient(t)
 
-	testutil.WaitForDaemonSet(t, client, namespace, daemonset, time.Second*5, time.Minute*5)
+	testutil.WaitForDaemonSet(t, client, namespace, daemonset, testutil.RetryInterval, testutil.Timeout)
 }
 
 func TestUpdateOperatorDeployment(t *testing.T) {
@@ -41,5 +40,5 @@ func TestUpdateOperatorDeployment(t *testing.T) {
 
 	client := testutil.CreateKubeClient(t)
 
-	testutil.WaitForDeployment(t, client, namespace, deployment, time.Second*5, time.Minute*5)
+	testutil.WaitForDeployment(t, client, namespace, deployment, testutil.RetryInterval, testutil.Timeout)
 }
diff --git a/test/components/gangway/gangway_test.go b/test/components/gangway/gangway_test.go
@@ -19,7 +19,6 @@ package gangway
 
 import (
 	"testing"
-	"time"
 
 	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
@@ -33,6 +32,6 @@ func TestGangwayDeployment(t *testing.T) {
 		t.Parallel()
 		deployment := "gangway"
 
-		testutil.WaitForDeployment(t, client, namespace, deployment, time.Second*5, time.Minute*5)
+		testutil.WaitForDeployment(t, client, namespace, deployment, testutil.RetryInterval, testutil.Timeout)
 	})
 }
diff --git a/test/components/httpbin/httpbin_test.go b/test/components/httpbin/httpbin_test.go
@@ -20,22 +20,16 @@ package httpbin
 import (
 	"fmt"
 	"testing"
-	"time"
 
 	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
 
-const (
-	defaultDeploymentTimeout       = 5 * time.Minute
-	defaultDeploymentProbeInterval = 5 * time.Second
-)
-
 func TestHttpbinDeployments(t *testing.T) {
 	client := testutil.CreateKubeClient(t)
 
 	t.Run(fmt.Sprintf("deployment"), func(t *testing.T) {
 		t.Parallel()
 
-		testutil.WaitForDeployment(t, client, "httpbin", "httpbin", defaultDeploymentProbeInterval, defaultDeploymentTimeout)
+		testutil.WaitForDeployment(t, client, "httpbin", "httpbin", testutil.RetryInterval, testutil.Timeout)
 	})
 }
diff --git a/test/components/istio/istio_test.go b/test/components/istio/istio_test.go
@@ -19,16 +19,10 @@ package istio_test
 
 import (
 	"testing"
-	"time"
 
 	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
 
-const (
-	retryInterval = 3 * time.Second
-	timeout       = 7 * time.Minute
-)
-
 func TestIstioDeployments(t *testing.T) {
 	deployments := []struct {
 		Namespace  string
@@ -51,7 +45,7 @@ func TestIstioDeployments(t *testing.T) {
 		t.Run(d.Deployment, func(t *testing.T) {
 			t.Parallel()
 
-			testutil.WaitForDeployment(t, client, d.Namespace, d.Deployment, retryInterval, timeout)
+			testutil.WaitForDeployment(t, client, d.Namespace, d.Deployment, testutil.RetryInterval, testutil.TimeoutSlower)
 		})
 	}
 }
diff --git a/test/components/kubernetes/controller-manager_test.go b/test/components/kubernetes/controller-manager_test.go
@@ -31,5 +31,5 @@ func TestControllerManagerDeployment(t *testing.T) {
 
 	client := testutil.CreateKubeClient(t)
 
-	testutil.WaitForDeployment(t, client, namespace, deployment, retryInterval, timeout)
+	testutil.WaitForDeployment(t, client, namespace, deployment, testutil.RetryInterval, testutil.Timeout)
 }
diff --git a/test/components/kubernetes/kubelet_disruptive_test.go b/test/components/kubernetes/kubelet_disruptive_test.go
@@ -20,7 +20,6 @@ package kubernetes
 import (
 	"context"
 	"testing"
-	"time"
 
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -49,10 +48,8 @@ func TestSelfHostedKubeletLabels(t *testing.T) {
 		t.Errorf("could not delete the node %s: %v", chosenNode, err)
 	}
 
-	retryInterval := time.Second * 5
-	timeout := time.Minute * 5
 	// Wait for the node to come up.
-	if err = wait.PollImmediate(retryInterval, timeout, func() (done bool, err error) {
+	if err = wait.PollImmediate(testutil.RetryInterval, testutil.Timeout, func() (done bool, err error) {
 		node, err := client.CoreV1().Nodes().Get(context.TODO(), chosenNode, metav1.GetOptions{})
 		if err != nil {
 			if k8serrors.IsNotFound(err) {

diff --git a/test/components/kubernetes/kubelet_test.go b/test/components/kubernetes/kubelet_test.go
@@ -19,15 +19,10 @@ package kubernetes
 
 import (
 	"testing"
-	"time"
 
 	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
 
-const retryInterval = time.Second * 5
-
-const timeout = time.Minute * 5
-
 func TestSelfHostedKubeletPods(t *testing.T) {
 	t.Parallel()
 
@@ -36,5 +31,5 @@ func TestSelfHostedKubeletPods(t *testing.T) {
 	namespace := "kube-system"
 	daemonset := "kubelet"
 
-	testutil.WaitForDaemonSet(t, client, namespace, daemonset, retryInterval, timeout)
+	testutil.WaitForDaemonSet(t, client, namespace, daemonset, testutil.RetryInterval, testutil.Timeout)
 }
diff --git a/test/components/linkerd/linkerd_test.go b/test/components/linkerd/linkerd_test.go
@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"testing"
-	"time"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -58,7 +57,7 @@ func TestLinkerdDeployment(t *testing.T) {
 		t.Run(d, func(t *testing.T) {
 			t.Parallel()
 
-			testutil.WaitForDeployment(t, client, namespace, d, retryInterval, timeout)
+			testutil.WaitForDeployment(t, client, namespace, d, testutil.RetryInterval, testutil.TimeoutSlower)
 		})
 	}
 }
@@ -116,9 +115,6 @@ spec:
   - name: download-dir
     emptyDir: {}
 `
-
-	retryInterval = 5 * time.Second
-	timeout       = 9 * time.Minute
 )
 
 //nolint: funlen
@@ -160,7 +156,7 @@ func TestLinkerdCheck(t *testing.T) {
 	podsClient := client.Pods(ns.Name)
 
 	// Retry pod creation. This might fail if Linkerd is not ready yet and some requests might fail.
-	if err := wait.PollImmediate(retryInterval, timeout, func() (done bool, err error) {
+	if err := wait.PollImmediate(testutil.RetryInterval, testutil.TimeoutSlower, func() (done bool, err error) {
 		pod, err = podsClient.Create(context.TODO(), pod, metav1.CreateOptions{})
 		if err != nil {
 			t.Logf("retrying pod creation, failed with: %v", err)
@@ -175,7 +171,7 @@ func TestLinkerdCheck(t *testing.T) {
 
 	phase := corev1.PodUnknown
 
-	if err := wait.PollImmediate(retryInterval, timeout, func() (done bool, err error) {
+	if err := wait.PollImmediate(testutil.RetryInterval, testutil.TimeoutSlower, func() (done bool, err error) {
 		p, err := podsClient.Get(context.TODO(), pod.Name, metav1.GetOptions{})
 		if err != nil {
 			return false, fmt.Errorf("couldn't get the pod %q: %w", pod.Name, err)

diff --git a/test/components/metallb/metallb_test.go b/test/components/metallb/metallb_test.go
@@ -19,7 +19,6 @@ package metallb
 
 import (
 	"testing"
-	"time"
 
 	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
@@ -33,13 +32,13 @@ func TestMetalLBDeployment(t *testing.T) {
 		t.Parallel()
 		daemonset := "speaker"
 
-		testutil.WaitForDaemonSet(t, client, namespace, daemonset, time.Second*5, time.Minute*5)
+		testutil.WaitForDaemonSet(t, client, namespace, daemonset, testutil.RetryInterval, testutil.Timeout)
 	})
 
 	t.Run("controller deployment", func(t *testing.T) {
 		t.Parallel()
 		deployment := "controller"
 
-		testutil.WaitForDeployment(t, client, namespace, deployment, time.Second*5, time.Minute*5)
+		testutil.WaitForDeployment(t, client, namespace, deployment, testutil.RetryInterval, testutil.Timeout)
 	})
 }
diff --git a/test/components/metrics-server/metrics_server_test.go b/test/components/metrics-server/metrics_server_test.go
@@ -19,7 +19,6 @@ package metricsserver
 
 import (
 	"testing"
-	"time"
 
 	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
@@ -33,6 +32,6 @@ func TestMetricsServerDeployment(t *testing.T) {
 		t.Parallel()
 		deployment := "metrics-server"
 
-		testutil.WaitForDeployment(t, client, namespace, deployment, time.Second*5, time.Minute*5)
+		testutil.WaitForDeployment(t, client, namespace, deployment, testutil.RetryInterval, testutil.Timeout)
 	})
 }