From 0f942c982a6eae15df3c921f536a100b1e912522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Th=C3=B6mmes?= Date: Mon, 15 Jun 2020 11:44:11 +0200 Subject: [PATCH] Add route consistency retry to new logging E2E test. --- test/e2e/logging_test.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/e2e/logging_test.go b/test/e2e/logging_test.go index 63b16d0f38cf..0df5c7501d40 100644 --- a/test/e2e/logging_test.go +++ b/test/e2e/logging_test.go @@ -32,6 +32,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "knative.dev/pkg/system" + pkgTest "knative.dev/pkg/test" "knative.dev/pkg/test/logstream" "knative.dev/serving/pkg/apis/autoscaling" "knative.dev/serving/pkg/network" @@ -68,9 +69,16 @@ func TestRequestLogs(t *testing.T) { t.Fatalf("Failed to create initial Service: %v: %v", names.Service, err) } - _, err = sendRequest(t, clients, test.ServingFlags.ResolvableDomain, resources.Route.Status.URL.URL()) + _, err = pkgTest.WaitForEndpointState( + clients.KubeClient, + t.Logf, + resources.Route.Status.URL.URL(), + v1test.RetryingRouteInconsistency(pkgTest.MatchesAllOf(pkgTest.IsStatusOK, pkgTest.MatchesBody(test.HelloWorldText))), + "WaitForEndpointToServeText", + test.ServingFlags.ResolvableDomain, + test.AddRootCAtoTransport(t.Logf, clients, test.ServingFlags.Https)) if err != nil { - t.Fatal("Unexpected error when sending request to helloworld:", err) + t.Fatalf("The endpoint didn't serve the expected text %q: %v", test.HelloWorldText, err) } pod, err := theOnlyPod(clients, resources.Revision.Namespace, resources.Revision.Name)