Skip to content

Commit 2a798d1

Browse files
authored
fix(test): Unstable controllername assertion (#2523)
1 parent e5d831e commit 2a798d1

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

test/e2e/gatewayapi/gateway.go

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -280,14 +280,24 @@ spec:
280280
By("create Gateway")
281281
err = s.CreateResourceFromStringWithNamespace(defaultGateway, s.Namespace())
282282
Expect(err).NotTo(HaveOccurred(), "creating Gateway")
283-
time.Sleep(10 * time.Second)
284283

285-
tls, err := s.DefaultDataplaneResource().SSL().List(context.Background())
286-
assert.Nil(GinkgoT(), err, "list tls error")
287-
assert.Len(GinkgoT(), tls, 1, "tls number not expect")
288-
assert.Len(GinkgoT(), tls[0].Certificates, 1, "length of certificates not expect")
289-
assert.Equal(GinkgoT(), Cert, tls[0].Certificates[0].Certificate, "tls cert not expect")
290-
assert.Equal(GinkgoT(), tls[0].Labels["k8s/controller-name"], s.GetControllerName())
284+
Eventually(func() error {
285+
tls, err := s.DefaultDataplaneResource().SSL().List(context.Background())
286+
Expect(err).NotTo(HaveOccurred(), "list ssl")
287+
if len(tls) != 1 {
288+
return fmt.Errorf("expect 1 ssl, got %d", len(tls))
289+
}
290+
if len(tls[0].Certificates) != 1 {
291+
return fmt.Errorf("expect 1 certificate, got %d", len(tls[0].Certificates))
292+
}
293+
if Cert != tls[0].Certificates[0].Certificate {
294+
return fmt.Errorf("expect cert %s, got %s", Cert, tls[0].Certificates[0].Certificate)
295+
}
296+
if s.GetControllerName() != tls[0].Labels["k8s/controller-name"] {
297+
return fmt.Errorf("expect controller name %s, got %s", s.GetControllerName(), tls[0].Labels["k8s/controller-name"])
298+
}
299+
return nil
300+
}).WithTimeout(20 * time.Second).ProbeEvery(time.Second).ShouldNot(HaveOccurred())
291301

292302
By("update secret")
293303
err = s.NewKubeTlsSecret(secretName, framework.TestCert, framework.TestKey)

0 commit comments

Comments
 (0)