weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix potential race in e2e duration checking

Browse Source 
Signed-off-by: James Munnelly <james@munnelly.eu>
This commit is contained in:
James Munnelly 2018-11-28 21:30:20 +00:00
parent 76f2eaff24
commit b2dead1943
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/suite/issuers/ca/certificate.go
View File

@ -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)
})
}

2
test/e2e/suite/issuers/selfsigned/certificate.go
View File

@ -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)
})
}
})

2
test/e2e/suite/issuers/vault/certificate/approle.go
View File

@ -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())
})
}
})