fix typo in timeout interval

projectcapsule · Aug 31, 2020 · d7dd352 · d7dd352
1 parent f6aace2
commit d7dd352
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 41 deletions.
diff --git a/e2e/ingress_class_test.go b/e2e/ingress_class_test.go
@@ -68,8 +68,8 @@ var _ = Describe("when Tenant handles Ingress classes", func() {
 		ns := NewNamespace("ingress-class-disallowed")
 		cs := ownerClient(tnt)
 
-		NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-		NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+		NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+		NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 
 		By("non-specifying the class", func() {
 			Eventually(func() (err error) {
@@ -131,8 +131,8 @@ var _ = Describe("when Tenant handles Ingress classes", func() {
 		ns := NewNamespace("ingress-class-allowed-annotation")
 		cs := ownerClient(tnt)
 
-		NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-		NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+		NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+		NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 
 		for _, c := range tnt.Spec.IngressClasses {
 			Eventually(func() (err error) {
@@ -171,8 +171,8 @@ var _ = Describe("when Tenant handles Ingress classes", func() {
 			Skip("Running test ont Kubernetes " + v.String() + ", doesn't provide .spec.ingressClassName")
 		}
 
-		NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-		NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+		NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+		NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 
 		for _, c := range tnt.Spec.IngressClasses {
 			Eventually(func() (err error) {

diff --git a/e2e/new_namespace_test.go b/e2e/new_namespace_test.go
@@ -55,7 +55,7 @@ var _ = Describe("creating a Namespace as Tenant owner", func() {
 	})
 	It("should be available in Tenant namespaces list", func() {
 		ns := NewNamespace("new-namespace")
-		NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-		NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+		NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+		NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 	})
 })
diff --git a/e2e/overquota_namespace_test.go b/e2e/overquota_namespace_test.go
@@ -57,8 +57,8 @@ var _ = Describe("creating a Namespace over-quota", func() {
 		By("creating three Namespaces", func() {
 			for _, name := range []string{"bob-dev", "bob-staging", "bob-production"} {
 				ns := NewNamespace(name)
-				NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-				NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+				NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+				NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 			}
 		})
 

diff --git a/e2e/owner_webhooks_test.go b/e2e/owner_webhooks_test.go
@@ -106,8 +106,8 @@ var _ = Describe("when Tenant owner interacts with the webhooks", func() {
 	It("should disallow deletions", func() {
 		By("blocking Capsule Limit ranges", func() {
 			ns := NewNamespace("limit-range-disallow")
-			NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-			NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+			NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+			NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 
 			lr := &corev1.LimitRange{}
 			Eventually(func() error {
@@ -120,8 +120,8 @@ var _ = Describe("when Tenant owner interacts with the webhooks", func() {
 		})
 		By("blocking Capsule Network Policy", func() {
 			ns := NewNamespace("network-policy-disallow")
-			NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-			NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+			NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+			NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 
 			np := &networkingv1.NetworkPolicy{}
 			Eventually(func() error {
@@ -134,8 +134,8 @@ var _ = Describe("when Tenant owner interacts with the webhooks", func() {
 		})
 		By("blocking blocking Capsule Resource Quota", func() {
 			ns := NewNamespace("resource-quota-disallow")
-			NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-			NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+			NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+			NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 
 			rq := &corev1.ResourceQuota{}
 			Eventually(func() error {
@@ -150,8 +150,8 @@ var _ = Describe("when Tenant owner interacts with the webhooks", func() {
 	It("should allow listing", func() {
 		By("Limit Range resources", func() {
 			ns := NewNamespace("limit-range-list")
-			NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-			NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+			NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+			NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 
 			Eventually(func() (err error) {
 				cs := ownerClient(tnt)
@@ -161,8 +161,8 @@ var _ = Describe("when Tenant owner interacts with the webhooks", func() {
 		})
 		By("Network Policy resources", func() {
 			ns := NewNamespace("network-policy-list")
-			NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-			NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+			NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+			NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 
 			Eventually(func() (err error) {
 				cs := ownerClient(tnt)
@@ -172,8 +172,8 @@ var _ = Describe("when Tenant owner interacts with the webhooks", func() {
 		})
 		By("Resource Quota resources", func() {
 			ns := NewNamespace("resource-quota-list")
-			NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-			NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+			NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+			NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 
 			Eventually(func() (err error) {
 				cs := ownerClient(tnt)
@@ -184,8 +184,8 @@ var _ = Describe("when Tenant owner interacts with the webhooks", func() {
 	})
 	It("should allow all actions to Tenant owner Network Policy resources", func() {
 		ns := NewNamespace("network-policy-allow")
-		NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-		NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+		NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+		NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 
 		cs := ownerClient(tnt)
 		np := &networkingv1.NetworkPolicy{

diff --git a/e2e/resource_quota_exceeded_test.go b/e2e/resource_quota_exceeded_test.go
@@ -128,8 +128,8 @@ var _ = Describe("exceeding Tenant resource quota", func() {
 		By("creating the Namespaces", func() {
 			for _, i := range nsl {
 				ns := NewNamespace(i)
-				NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-				NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+				NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+				NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 			}
 		})
 	})

diff --git a/e2e/selecting_tenant_no_label_test.go b/e2e/selecting_tenant_no_label_test.go
@@ -93,7 +93,7 @@ var _ = Describe("creating a Namespace without a Tenant selector", func() {
 	})
 	It("should be assigned to the first Tenant", func() {
 		ns := NewNamespace("tenant-1-ns")
-		NamespaceCreationShouldSucceed(ns, t3, defaultPollInterval)
-		NamespaceShouldBeManagedByTenant(ns, t1, defaultPollInterval)
+		NamespaceCreationShouldSucceed(ns, t3, defaultTimeoutInterval)
+		NamespaceShouldBeManagedByTenant(ns, t1, defaultTimeoutInterval)
 	})
 })
diff --git a/e2e/selecting_tenant_test.go b/e2e/selecting_tenant_test.go
@@ -81,7 +81,7 @@ var _ = Describe("creating a Namespace with Tenant selector", func() {
 				l: t2.Name,
 			}
 		})
-		NamespaceCreationShouldSucceed(ns, t2, defaultPollInterval)
-		NamespaceShouldBeManagedByTenant(ns, t2, defaultPollInterval)
+		NamespaceCreationShouldSucceed(ns, t2, defaultTimeoutInterval)
+		NamespaceShouldBeManagedByTenant(ns, t2, defaultTimeoutInterval)
 	})
 })
diff --git a/e2e/storage_class_test.go b/e2e/storage_class_test.go
@@ -63,8 +63,8 @@ var _ = Describe("when Tenant handles Storage classes", func() {
 	})
 	It("should block non allowed Storage Class", func() {
 		ns := NewNamespace("storage-class-disallowed")
-		NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-		NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+		NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+		NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 
 		By("non-specifying the class", func() {
 			Eventually(func() (err error) {
@@ -111,8 +111,8 @@ var _ = Describe("when Tenant handles Storage classes", func() {
 		ns := NewNamespace("storage-class-allowed")
 		cs := ownerClient(tnt)
 
-		NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-		NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+		NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+		NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 
 		for _, c := range tnt.Spec.StorageClasses {
 			Eventually(func() (err error) {

diff --git a/e2e/tenant_owner_group_test.go b/e2e/tenant_owner_group_test.go
@@ -56,8 +56,8 @@ var _ = Describe("creating a Namespace with group Tenant owner", func() {
 	})
 	It("should succeed and be available in Tenant namespaces list", func() {
 		ns := NewNamespace("gto-namespace")
-		NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-		NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
-		GroupShouldBeUsedInTenantRoleBinding(ns, tnt, defaultPollInterval)
+		NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+		NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
+		GroupShouldBeUsedInTenantRoleBinding(ns, tnt, defaultTimeoutInterval)
 	})
 })
diff --git a/e2e/tenant_resources_changes_test.go b/e2e/tenant_resources_changes_test.go
@@ -171,8 +171,8 @@ var _ = Describe("changing Tenant managed Kubernetes resources", func() {
 		By("creating the Namespaces", func() {
 			for _, i := range nsl {
 				ns := NewNamespace(i)
-				NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-				NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+				NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+				NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 			}
 		})
 	})

diff --git a/e2e/tenant_resources_test.go b/e2e/tenant_resources_test.go
@@ -174,8 +174,8 @@ var _ = Describe("creating namespaces within a Tenant with resources", func() {
 		By("creating the Namespaces", func() {
 			for _, i := range nsl {
 				ns := NewNamespace(i)
-				NamespaceCreationShouldSucceed(ns, tnt, defaultPollInterval)
-				NamespaceShouldBeManagedByTenant(ns, tnt, defaultPollInterval)
+				NamespaceCreationShouldSucceed(ns, tnt, defaultTimeoutInterval)
+				NamespaceShouldBeManagedByTenant(ns, tnt, defaultTimeoutInterval)
 			}
 		})
 	})