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

stop relying on context.DeadlineExceeded error in tests

Browse Source 
Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
This commit is contained in:
Tim Ramlot 2024-01-03 14:05:13 +01:00
parent a0f2849425
commit 8111b43b10
No known key found for this signature in database
GPG Key ID: 47428728E0C2878D
3 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/suite/issuers/acme/issuer.go
View File

@ -321,7 +321,15 @@ var _ = framework.CertManagerDescribe("ACME Issuer", func() {
// TODO: we should use observedGeneration here, but currently it won't
// be incremented correctly in this scenario.
// Verify that Issuer's Ready condition remains True for 5 seconds.
err = wait.PollUntilContextTimeout(context.TODO(), time.Millisecond*200, time.Second*5, true, func(ctx context.Context) (bool, error) {
startTime := time.Now()
successful := false
err = wait.PollUntilContextCancel(context.TODO(), time.Millisecond*200, true, func(ctx context.Context) (bool, error) {
// Check if issuer has been ready for 5s
if time.Since(startTime) > time.Second*5 {
successful = true
return true, nil
}
iss, err := f.CertManagerClientSet.CertmanagerV1().Issuers(f.Namespace.Name).Get(ctx, issuerName, metav1.GetOptions{})
if err != nil {
return false, err
@ -335,7 +343,7 @@ var _ = framework.CertManagerDescribe("ACME Issuer", func() {
// keep polling
return false, nil
})
Expect(err).To(HaveOccurred())
Expect(err).To(MatchError(context.DeadlineExceeded))
Expect(err).NotTo(HaveOccurred())
Expect(successful).To(BeTrue())
})
})

14
test/integration/acme/orders_controller_test.go
View File

@ -260,7 +260,15 @@ func TestAcmeOrdersController(t *testing.T) {
// Reason field on Order's status. Change this test once we are setting
// Reasons on intermittent Order states.
var pendingOrder *cmacme.Order
err = wait.PollUntilContextTimeout(ctx, time.Millisecond*200, acmeorders.RequeuePeriod, true, func(ctx context.Context) (bool, error) {
startTime := time.Now()
successful := false
err = wait.PollUntilContextCancel(ctx, time.Millisecond*200, true, func(ctx context.Context) (bool, error) {
// Check if order has been pending for 2s (requeue period)
if time.Since(startTime) > acmeorders.RequeuePeriod {
successful = true
return true, nil
}
pendingOrder, err = cmCl.AcmeV1().Orders(testName).Get(ctx, testName, metav1.GetOptions{})
if err != nil {
return false, err
@ -271,9 +279,9 @@ func TestAcmeOrdersController(t *testing.T) {
return false, nil
})
switch {
case err == nil:
case err == nil && !successful:
t.Fatalf("Expected Order to have pending status instead got: %v", pendingOrder.Status.State)
case err == context.DeadlineExceeded:
case err == nil && successful:
// this is the expected 'happy case'
default:
t.Fatal(err)

14
test/integration/certificates/trigger_controller_test.go
View File

@ -345,7 +345,15 @@ func TestTriggerController_ExpBackoff(t *testing.T) {
func ensureCertificateDoesNotHaveIssuingCondition(t *testing.T, ctx context.Context, cmCl cmclient.Interface, namespace, name string) {
t.Helper()
err := wait.PollUntilContextTimeout(ctx, time.Millisecond*200, time.Second*2, true, func(ctx context.Context) (bool, error) {
startTime := time.Now()
successful := false
err := wait.PollUntilContextCancel(ctx, time.Millisecond*200, true, func(ctx context.Context) (bool, error) {
// Check if certificate has not had condition for 2s
if time.Since(startTime) > time.Second*2 {
successful = true
return true, nil
}
c, err := cmCl.CertmanagerV1().Certificates(namespace).Get(ctx, name, metav1.GetOptions{})
if err != nil {
return false, err
@ -360,9 +368,9 @@ func ensureCertificateDoesNotHaveIssuingCondition(t *testing.T, ctx context.Cont
return false, nil
})
switch {
case err == nil:
case err == nil && !successful:
t.Fatal("expected Certificate to not have the Issuing condition")
case err == context.DeadlineExceeded:
case err == nil && successful:
// this is the expected 'happy case'
default:
t.Fatal(err)