diff --git a/test/e2e/framework/timeouts.go b/test/e2e/framework/timeouts.go index ac636ddd76d..f7edd418dc5 100644 --- a/test/e2e/framework/timeouts.go +++ b/test/e2e/framework/timeouts.go @@ -18,25 +18,24 @@ package framework import "time" -const ( - // Default timeouts to be used in TimeoutContext - podStartTimeout = 5 * time.Minute - podStartShortTimeout = 2 * time.Minute - podStartSlowTimeout = 15 * time.Minute - podDeleteTimeout = 5 * time.Minute - claimProvisionTimeout = 5 * time.Minute - claimProvisionShortTimeout = 1 * time.Minute - dataSourceProvisionTimeout = 5 * time.Minute - claimBoundTimeout = 3 * time.Minute - pvReclaimTimeout = 3 * time.Minute - pvBoundTimeout = 3 * time.Minute - pvCreateTimeout = 3 * time.Minute - pvDeleteTimeout = 5 * time.Minute - pvDeleteSlowTimeout = 20 * time.Minute - snapshotCreateTimeout = 5 * time.Minute - snapshotDeleteTimeout = 5 * time.Minute - snapshotControllerMetricsTimeout = 5 * time.Minute -) +var defaultTimeouts = TimeoutContext{ + PodStart: 5 * time.Minute, + PodStartShort: 2 * time.Minute, + PodStartSlow: 15 * time.Minute, + PodDelete: 5 * time.Minute, + ClaimProvision: 5 * time.Minute, + ClaimProvisionShort: 1 * time.Minute, + DataSourceProvision: 5 * time.Minute, + ClaimBound: 3 * time.Minute, + PVReclaim: 3 * time.Minute, + PVBound: 3 * time.Minute, + PVCreate: 3 * time.Minute, + PVDelete: 5 * time.Minute, + PVDeleteSlow: 20 * time.Minute, + SnapshotCreate: 5 * time.Minute, + SnapshotDelete: 5 * time.Minute, + SnapshotControllerMetrics: 5 * time.Minute, +} // TimeoutContext contains timeout settings for several actions. type TimeoutContext struct { @@ -93,22 +92,8 @@ type TimeoutContext struct { // NewTimeoutContextWithDefaults returns a TimeoutContext with default values. func NewTimeoutContextWithDefaults() *TimeoutContext { - return &TimeoutContext{ - PodStart: podStartTimeout, - PodStartShort: podStartShortTimeout, - PodStartSlow: podStartSlowTimeout, - PodDelete: podDeleteTimeout, - ClaimProvision: claimProvisionTimeout, - ClaimProvisionShort: claimProvisionShortTimeout, - DataSourceProvision: dataSourceProvisionTimeout, - ClaimBound: claimBoundTimeout, - PVReclaim: pvReclaimTimeout, - PVBound: pvBoundTimeout, - PVCreate: pvCreateTimeout, - PVDelete: pvDeleteTimeout, - PVDeleteSlow: pvDeleteSlowTimeout, - SnapshotCreate: snapshotCreateTimeout, - SnapshotDelete: snapshotDeleteTimeout, - SnapshotControllerMetrics: snapshotControllerMetricsTimeout, - } + // Make a copy, otherwise the caller would have the ability to + // modify the defaults + copy := defaultTimeouts + return © }