From cc213b67b437c9d64f3e34c78007a7c15eb005b0 Mon Sep 17 00:00:00 2001 From: Sarah Alsmiller Date: Tue, 21 Feb 2023 16:20:27 -0600 Subject: [PATCH] httproute hittable --- .../test/gateways/gateway_endpoint_test.go | 11 +++-------- .../consul-container/test/gateways/http_route_test.go | 3 --- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/test/integration/consul-container/test/gateways/gateway_endpoint_test.go b/test/integration/consul-container/test/gateways/gateway_endpoint_test.go index 0d0b902b8f..25902ae08a 100644 --- a/test/integration/consul-container/test/gateways/gateway_endpoint_test.go +++ b/test/integration/consul-container/test/gateways/gateway_endpoint_test.go @@ -152,18 +152,13 @@ func createService(t *testing.T, cluster *libcluster.Cluster, serviceOpts *libse // Create a service and proxy instance // Create a service and proxy instance - _, _, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOpts) - require.NoError(t, err) + service, _, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOpts) + assert.NoError(t, err) libassert.CatalogServiceExists(t, client, serviceOpts.Name+"-sidecar-proxy") libassert.CatalogServiceExists(t, client, serviceOpts.Name) - // Create a client proxy instance with the server as an upstream - //TODO this is always going to be named static-client-sidecar-proxy and I don't know if that matters - clientConnectProxy, err := libservice.CreateAndRegisterStaticClientSidecar(node, "", false) - require.NoError(t, err) - libassert.CatalogServiceExists(t, client, "static-client-sidecar-proxy") - return clientConnectProxy + return service } func createServices(t *testing.T, cluster *libcluster.Cluster, ports ...int) (libservice.Service, libservice.Service) { diff --git a/test/integration/consul-container/test/gateways/http_route_test.go b/test/integration/consul-container/test/gateways/http_route_test.go index 59f9acc14b..553a376791 100644 --- a/test/integration/consul-container/test/gateways/http_route_test.go +++ b/test/integration/consul-container/test/gateways/http_route_test.go @@ -211,9 +211,6 @@ func TestHTTPRouteFlattening(t *testing.T) { "x-v2": "v2", }) - for { - } - //libassert.HTTPServiceEchoes(t, "localhost", gatewayService.GetPort(listenerPort), "v2") //checkRoute(t, // gatewayService.GetPort(listenerPort),