From a5618b537e186a9bf8073f1fea5fe86ea51e7e32 Mon Sep 17 00:00:00 2001 From: Kenjiro Nakayama Date: Wed, 1 Dec 2021 13:02:24 +0900 Subject: [PATCH] Use CheckEndpointState in v1beta1 domainmapping test --- test/conformance/api/v1beta1/domain_mapping_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/conformance/api/v1beta1/domain_mapping_test.go b/test/conformance/api/v1beta1/domain_mapping_test.go index 564a96e606ba..0d04ace65a16 100644 --- a/test/conformance/api/v1beta1/domain_mapping_test.go +++ b/test/conformance/api/v1beta1/domain_mapping_test.go @@ -115,7 +115,7 @@ func TestDomainMapping(t *testing.T) { t.Logf, endpoint, spoof.MatchesAllOf(spoof.IsStatusOK, spoof.MatchesBody(test.PizzaPlanetText1)), - "WaitForSuccessfulResponse", + "CheckSuccessfulResponse", resolvableCustomDomain, test.AddRootCAtoTransport(context.Background(), t.Logf, clients, test.ServingFlags.HTTPS)); err != nil { t.Fatalf("Error probing %s: %v", endpoint, err) @@ -176,13 +176,13 @@ func TestDomainMapping(t *testing.T) { // Because the second DomainMapping collided with the first, it should not have taken effect. t.Log("Probing", endpoint) - if _, err := pkgtest.WaitForEndpointState( + if _, err := pkgtest.CheckEndpointState( context.Background(), clients.KubeClient, t.Logf, endpoint, spoof.MatchesAllOf(spoof.IsStatusOK, spoof.MatchesBody(test.PizzaPlanetText1)), - "WaitForSuccessfulResponse", + "CheckSuccessfulResponse", resolvableCustomDomain, test.AddRootCAtoTransport(context.Background(), t.Logf, clients, test.ServingFlags.HTTPS)); err != nil { t.Fatalf("Error probing %s: %v", endpoint, err) @@ -209,13 +209,13 @@ func TestDomainMapping(t *testing.T) { endpoint = altDm.Status.URL.URL() t.Log("Probing", endpoint) - if _, err := pkgtest.WaitForEndpointState( + if _, err := pkgtest.CheckEndpointState( context.Background(), clients.KubeClient, t.Logf, endpoint, spoof.MatchesAllOf(spoof.IsStatusOK, spoof.MatchesBody(test.PizzaPlanetText2)), - "WaitForSuccessfulResponse", + "CheckSuccessfulResponse", resolvableCustomDomain, test.AddRootCAtoTransport(context.Background(), t.Logf, clients, test.ServingFlags.HTTPS)); err != nil { t.Fatalf("Error probing %s: %v", endpoint, err)