github/capsule
1
0
Fork 0
mirror of https://github.com/projectcapsule/capsule.git synced 2026-02-14 18:09:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Making e2e tests less flaky (#121)

Browse Source
This commit is contained in:
Dario Tranchitella
2020-10-31 12:28:17 +01:00
committed by GitHub
parent ee6e3aa0df
commit 2af568f0ed
18 changed files with 148 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
e2e/utils_test.go
View File

@@ -38,7 +38,7 @@ import (
)
const (
defaultTimeoutInterval = 15 * time.Second
defaultTimeoutInterval = 20 * time.Second
podRecreationTimeoutInterval = 90 * time.Second
defaultPollInterval = time.Second
)
@@ -51,37 +51,32 @@ func NewNamespace(name string) *corev1.Namespace {
}
}
func NamespaceCreationShouldSucceed(ns *corev1.Namespace, t *v1alpha1.Tenant, timeout time.Duration) {
func NamespaceCreation(ns *corev1.Namespace, t *v1alpha1.Tenant, timeout time.Duration) AsyncAssertion {
cs := ownerClient(t)
Eventually(func() (err error) {
return Eventually(func() (err error) {
_, err = cs.CoreV1().Namespaces().Create(context.TODO(), ns, metav1.CreateOptions{})
return
}, timeout, defaultPollInterval).Should(Succeed())
}, timeout, defaultPollInterval)
}
func NamespaceCreationShouldNotSucceed(ns *corev1.Namespace, t *v1alpha1.Tenant, timeout time.Duration) {
cs := ownerClient(t)
Eventually(func() (err error) {
_, err = cs.CoreV1().Namespaces().Create(context.TODO(), ns, metav1.CreateOptions{})
return
}, timeout, defaultPollInterval).ShouldNot(Succeed())
}
func NamespaceShouldBeManagedByTenant(ns *corev1.Namespace, t *v1alpha1.Tenant, timeout time.Duration) {
Eventually(func() v1alpha1.NamespaceList {
func TenantNamespaceList(t *v1alpha1.Tenant, timeout time.Duration) AsyncAssertion {
return Eventually(func() v1alpha1.NamespaceList {
Expect(k8sClient.Get(context.TODO(), types.NamespacedName{Name: t.GetName()}, t)).Should(Succeed())
return t.Status.Namespaces
}, timeout, defaultPollInterval).Should(ContainElement(ns.GetName()))
}, timeout, defaultPollInterval)
}
func CapsuleClusterGroupParamShouldBeUpdated(capsuleClusterGroup string, timeout time.Duration) {
func EventuallyCreation(f interface{}) AsyncAssertion {
return Eventually(f, defaultTimeoutInterval, defaultPollInterval)
}
func CapsuleClusterGroupParam(timeout time.Duration) AsyncAssertion {
capsuleCRB := &rbacv1.ClusterRoleBinding{}
Eventually(func() string {
return Eventually(func() string {
Expect(k8sClient.Get(context.TODO(), types.NamespacedName{Name: rbac.ProvisionerRoleName}, capsuleCRB)).Should(Succeed())
return capsuleCRB.Subjects[0].Name
}, timeout, defaultPollInterval).Should(BeIdenticalTo(capsuleClusterGroup))
}, timeout, defaultPollInterval)
}
func ModifyCapsuleManagerPodArgs(args []string) {