From 8c660f09bc5d1ed24574847f263d081dd33e9351 Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Mon, 17 May 2021 13:53:17 -0700 Subject: [PATCH] More debugging of tests which only fail in main CI --- test/deploy/tools/ldap.yaml | 2 +- test/library/client.go | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/test/deploy/tools/ldap.yaml b/test/deploy/tools/ldap.yaml index affb7c61..3728ab49 100644 --- a/test/deploy/tools/ldap.yaml +++ b/test/deploy/tools/ldap.yaml @@ -161,7 +161,7 @@ spec: cpu: "100m" #! one-tenth of one CPU memory: "64Mi" limits: - cpu: "200m" #! slapd needs a reasonable amount of CPU during initial startup or else it is slow to start + #! Do not limit CPU because it was causing issues running integration tests on AKS where openldap became very slow. memory: "64Mi" readinessProbe: tcpSocket: diff --git a/test/library/client.go b/test/library/client.go index 73baed90..f256444e 100644 --- a/test/library/client.go +++ b/test/library/client.go @@ -394,7 +394,10 @@ func CreateTestOIDCIdentityProvider(t *testing.T, spec idpv1alpha1.OIDCIdentityP require.Eventuallyf(t, func() bool { var err error result, err = upstreams.Get(ctx, created.Name, metav1.GetOptions{}) - require.NoError(t, err) + if err != nil { + t.Logf("error while getting OIDCIdentityProvider %s/%s: %s", created.Namespace, created.Name, err.Error()) + return false + } return result.Status.Phase == expectedPhase }, 60*time.Second, 1*time.Second, "expected the OIDCIdentityProvider to go into phase %s, OIDCIdentityProvider was: %s", expectedPhase, Sdump(result)) return result @@ -429,7 +432,10 @@ func CreateTestLDAPIdentityProvider(t *testing.T, spec idpv1alpha1.LDAPIdentityP require.Eventuallyf(t, func() bool { var err error result, err = upstreams.Get(ctx, created.Name, metav1.GetOptions{}) - require.NoError(t, err) + if err != nil { + t.Logf("error while getting LDAPIdentityProvider %s/%s: %s", created.Namespace, created.Name, err.Error()) + return false + } return result.Status.Phase == expectedPhase }, 60*time.Second, 1*time.Second, "expected the LDAPIdentityProvider to go into phase %s, LDAPIdentityProvider was: %s", expectedPhase, Sdump(result)) return result