From 584e827a01b03a9992652014d92fd067d44709f5 Mon Sep 17 00:00:00 2001 From: knrt10 Date: Wed, 7 Oct 2020 13:00:05 +0530 Subject: [PATCH] test/components/*: de-duplicate values timeout and retryInterval were same for most of the components and was duplicated. closes: #502 Signed-off-by: knrt10 --- .../aws-ebs-csi-driver/aws-ebs-csi-driver_test.go | 3 +-- test/components/cert-manager/cert-manager_test.go | 3 +-- .../cluster-autoscaler/cluster-autoscaler_test.go | 7 ++----- test/components/contour/contour_test.go | 5 ++--- test/components/coredns/coredns_test.go | 3 +-- test/components/dex/dex_test.go | 3 +-- test/components/external-dns/external-dns_test.go | 6 +++--- .../components/flatcar-linux-update-operator/fluo_test.go | 5 ++--- test/components/gangway/gangway_test.go | 3 +-- test/components/httpbin/httpbin_test.go | 8 +------- test/components/kubernetes/controller-manager_test.go | 2 +- test/components/kubernetes/kubelet_disruptive_test.go | 5 +---- test/components/kubernetes/kubelet_test.go | 7 +------ test/components/metallb/metallb_test.go | 5 ++--- test/components/metrics-server/metrics_server_test.go | 3 +-- test/components/openebs-operator/openebs_operator_test.go | 3 +-- test/components/rook/rook_test.go | 3 +-- test/components/util/util.go | 7 +++++++ 18 files changed, 30 insertions(+), 51 deletions(-) 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 index a9992ca35..7c78282f6 100644 --- 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 index 2d7b69a96..b42e51bd1 100644 --- 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) }) } } diff --git a/test/components/cluster-autoscaler/cluster-autoscaler_test.go b/test/components/cluster-autoscaler/cluster-autoscaler_test.go index 30b0abd29..20624401c 100644 --- 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 index 9bf8f4ccf..9778d48a4 100644 --- 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 index f660cad3f..f0b0adbd6 100644 --- 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 index 4a02c91c3..651782b55 100644 --- 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 index da76bfef8..e4eca308c 100644 --- 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 index e02be5b9b..0f86a357d 100644 --- 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 index 030174a12..61d7b10c5 100644 --- 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 index 900a456d4..d17f9de34 100644 --- 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/kubernetes/controller-manager_test.go b/test/components/kubernetes/controller-manager_test.go index 4d4ca97a6..118c6584f 100644 --- 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 index a983e1464..f9dd48fdf 100644 --- 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 index 7565eb321..1f3212c35 100644 --- 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/metallb/metallb_test.go b/test/components/metallb/metallb_test.go index db91219e1..dd1ef0e59 100644 --- 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 index d9863b5a3..fd292231b 100644 --- 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) }) } diff --git a/test/components/openebs-operator/openebs_operator_test.go b/test/components/openebs-operator/openebs_operator_test.go index eea9f8a54..906b190f1 100644 --- a/test/components/openebs-operator/openebs_operator_test.go +++ b/test/components/openebs-operator/openebs_operator_test.go @@ -19,7 +19,6 @@ package openebsoperator import ( "testing" - "time" testutil "github.com/kinvolk/lokomotive/test/components/util" ) @@ -42,7 +41,7 @@ func TestOpenEBSOperatorDeployment(t *testing.T) { t.Run("deployment", func(t *testing.T) { t.Parallel() - 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/rook/rook_test.go b/test/components/rook/rook_test.go index 339d43ab7..9b84269ce 100644 --- a/test/components/rook/rook_test.go +++ b/test/components/rook/rook_test.go @@ -19,7 +19,6 @@ package rook import ( "testing" - "time" testutil "github.com/kinvolk/lokomotive/test/components/util" ) @@ -33,6 +32,6 @@ func TestRookDeployment(t *testing.T) { t.Parallel() deployment := "rook-ceph-operator" - 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/util/util.go b/test/components/util/util.go index 7379f0a11..1114ed468 100644 --- a/test/components/util/util.go +++ b/test/components/util/util.go @@ -40,6 +40,13 @@ import ( "k8s.io/client-go/transport/spdy" ) +const ( + // RetryInterval is time for test to retry. + RetryInterval = time.Second * 5 + // Timeout is time after which tests stops and fails. + Timeout = time.Minute * 5 +) + func KubeconfigPath(t *testing.T) string { kubeconfig := os.ExpandEnv(os.Getenv("KUBECONFIG"))