httproute hittable

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)
+	service, _, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOpts)
-	require.NoError(t, err)
+	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
+	return service
-	//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
 
 }
 func createServices(t *testing.T, cluster *libcluster.Cluster, ports ...int) (libservice.Service, libservice.Service) {

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),