From b2dead1943702d92ec4110b4a7c81086b7c21ba7 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Wed, 28 Nov 2018 21:30:20 +0000 Subject: [PATCH] Fix potential race in e2e duration checking Signed-off-by: James Munnelly --- test/e2e/suite/issuers/ca/certificate.go | 2 +- test/e2e/suite/issuers/selfsigned/certificate.go | 2 +- test/e2e/suite/issuers/vault/certificate/approle.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/suite/issuers/ca/certificate.go b/test/e2e/suite/issuers/ca/certificate.go index 57e5a78c6..b2c0ce6c0 100644 --- a/test/e2e/suite/issuers/ca/certificate.go +++ b/test/e2e/suite/issuers/ca/certificate.go @@ -119,8 +119,8 @@ var _ = framework.CertManagerDescribe("CA Certificate", func() { Expect(err).NotTo(HaveOccurred()) By("Verifying the Certificate is valid") err = util.WaitCertificateIssuedValid(certClient, secretClient, certificateName, time.Second*30) - f.CertificateDurationValid(cert, v.expectedDuration) Expect(err).NotTo(HaveOccurred()) + f.CertificateDurationValid(cert, v.expectedDuration) }) } diff --git a/test/e2e/suite/issuers/selfsigned/certificate.go b/test/e2e/suite/issuers/selfsigned/certificate.go index bb1c3ce10..0c0bbb6d0 100644 --- a/test/e2e/suite/issuers/selfsigned/certificate.go +++ b/test/e2e/suite/issuers/selfsigned/certificate.go @@ -101,8 +101,8 @@ var _ = framework.CertManagerDescribe("Self Signed Certificate", func() { cert, err := certClient.Create(util.NewCertManagerBasicCertificate(certificateName, certificateSecretName, issuerDurationName, v1alpha1.IssuerKind, v.inputDuration, v.inputRenewBefore)) Expect(err).NotTo(HaveOccurred()) err = util.WaitCertificateIssuedValid(certClient, secretClient, certificateName, time.Second*30) - f.CertificateDurationValid(cert, v.expectedDuration) Expect(err).NotTo(HaveOccurred()) + f.CertificateDurationValid(cert, v.expectedDuration) }) } }) diff --git a/test/e2e/suite/issuers/vault/certificate/approle.go b/test/e2e/suite/issuers/vault/certificate/approle.go index 20562eec9..599b29b9c 100644 --- a/test/e2e/suite/issuers/vault/certificate/approle.go +++ b/test/e2e/suite/issuers/vault/certificate/approle.go @@ -177,10 +177,10 @@ var _ = framework.CertManagerDescribe("Vault Certificate (AppRole)", func() { Expect(err).NotTo(HaveOccurred()) err = util.WaitCertificateIssuedValid(certClient, secretClient, certificateName, time.Minute*5) + Expect(err).NotTo(HaveOccurred()) // Vault substract 30 seconds to the NotBefore date. f.CertificateDurationValid(cert, v.expectedDuration+(30*time.Second)) - Expect(err).NotTo(HaveOccurred()) }) } })