chore: initialise timeout factor next to the declaration (#1118)

mdelapenya · web-flow · commit 15a2a3d73e5f · 2021-05-04T15:47:58.000+02:00
* chore: initialise timeout factor on its own package

* chore: reuse timeout factor from common
diff --git a/e2e/_suites/fleet/ingest_manager_test.go b/e2e/_suites/fleet/ingest_manager_test.go
@@ -48,7 +48,6 @@ func setUpSuite() {
 	}
 	common.AgentVersionBase = v
 
-	common.TimeoutFactor = shell.GetEnvInteger("TIMEOUT_FACTOR", common.TimeoutFactor)
 	common.AgentVersion = shell.GetEnv("BEAT_VERSION", common.AgentVersionBase)
 
 	// check if version is an alias
diff --git a/e2e/_suites/helm/helm_charts_test.go b/e2e/_suites/helm/helm_charts_test.go
@@ -37,10 +37,6 @@ var elasticAPMActive = false
 
 var helmManager helm.Manager
 
-// timeoutFactor a multiplier for the max timeout when doing backoff retries.
-// It can be overriden by TIMEOUT_FACTOR env var
-var timeoutFactor = 2
-
 //nolint:unused
 var kubectlClient kubectl.Kubectl
 
@@ -80,7 +76,6 @@ func setupSuite() {
 	helmVersion = shell.GetEnv("HELM_VERSION", helmVersion)
 	helmChartVersion = shell.GetEnv("HELM_CHART_VERSION", helmChartVersion)
 	kubernetesVersion = shell.GetEnv("KUBERNETES_VERSION", kubernetesVersion)
-	timeoutFactor = shell.GetEnvInteger("TIMEOUT_FACTOR", timeoutFactor)
 
 	stackVersion = shell.GetEnv("STACK_VERSION", stackVersion)
 	v, err := utils.GetElasticArtifactVersion(stackVersion)
@@ -187,7 +182,7 @@ func (ts *HelmChartTestSuite) aResourceWillExposePods(resourceType string) error
 		return err
 	}
 
-	maxTimeout := time.Duration(timeoutFactor) * time.Minute
+	maxTimeout := time.Duration(common.TimeoutFactor) * time.Minute
 
 	exp := common.GetExponentialBackOff(maxTimeout)
 	retryCount := 1
diff --git a/e2e/_suites/kubernetes-autodiscover/autodiscover_test.go b/e2e/_suites/kubernetes-autodiscover/autodiscover_test.go
@@ -37,14 +37,6 @@ const defaultBeatVersion = "8.0.0-SNAPSHOT"
 var defaultEventsWaitTimeout = 60 * time.Second
 var defaultDeployWaitTimeout = 60 * time.Second
 
-func init() {
-	// initialise timeout factor
-	common.TimeoutFactor = shell.GetEnvInteger("TIMEOUT_FACTOR", common.TimeoutFactor)
-
-	defaultEventsWaitTimeout = defaultEventsWaitTimeout * time.Duration(common.TimeoutFactor)
-	defaultDeployWaitTimeout = defaultDeployWaitTimeout * time.Duration(common.TimeoutFactor)
-}
-
 type podsManager struct {
 	kubectl kubernetes.Control
 	ctx     context.Context
@@ -472,6 +464,9 @@ func InitializeTestSuite(ctx *godog.TestSuiteContext) {
 		// init logger
 		config.Init()
 
+		defaultEventsWaitTimeout = defaultEventsWaitTimeout * time.Duration(common.TimeoutFactor)
+		defaultDeployWaitTimeout = defaultDeployWaitTimeout * time.Duration(common.TimeoutFactor)
+
 		err := cluster.Initialize(suiteContext, "testdata/kind.yml")
 		if err != nil {
 			log.WithError(err).Fatal("Failed to initialize cluster")
diff --git a/internal/common/retry.go b/internal/common/retry.go
@@ -8,12 +8,17 @@ import (
 	"time"
 
 	backoff "github.com/cenkalti/backoff/v4"
+	"github.com/elastic/e2e-testing/internal/shell"
 )
 
 // TimeoutFactor a multiplier for the max timeout when doing backoff retries.
 // It can be overriden by TIMEOUT_FACTOR env var
 var TimeoutFactor = 3
 
+func init() {
+	TimeoutFactor = shell.GetEnvInteger("TIMEOUT_FACTOR", TimeoutFactor)
+}
+
 // GetExponentialBackOff returns a preconfigured exponential backoff instance
 func GetExponentialBackOff(elapsedTime time.Duration) *backoff.ExponentialBackOff {
 	var (

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ func setUpSuite() {`
`48`	`48`	`}`
`49`	`49`	`common.AgentVersionBase = v`
`50`	`50`
`51`		`- common.TimeoutFactor = shell.GetEnvInteger("TIMEOUT_FACTOR", common.TimeoutFactor)`
`52`	`51`	`common.AgentVersion = shell.GetEnv("BEAT_VERSION", common.AgentVersionBase)`
`53`	`52`
`54`	`53`	`// check if version is an alias`