From 131098159b713f63958e2eaad2d49cc4c4fea1a2 Mon Sep 17 00:00:00 2001 From: "Chris S. Kim" Date: Wed, 29 Nov 2023 09:35:20 -0500 Subject: [PATCH] [1.17.x] Move test setup out of subtest (#19754) Move test setup out of subtest --- .../controllers/sidecarproxy/controller_test.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/internal/mesh/internal/controllers/sidecarproxy/controller_test.go b/internal/mesh/internal/controllers/sidecarproxy/controller_test.go index 0d6684f0ef54..f3735767d372 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/controller_test.go +++ b/internal/mesh/internal/controllers/sidecarproxy/controller_test.go @@ -521,13 +521,11 @@ func (suite *controllerTestSuite) TestController() { webComputedDestinations *pbresource.Resource ) - testutil.RunStep(suite.T(), "proxy state template generation", func(t *testing.T) { - // Check that proxy state template resource is generated for both the api and web workloads. - retry.Run(t, func(r *retry.R) { - suite.client.RequireResourceExists(r, apiProxyStateTemplateID) - webProxyStateTemplate = suite.client.RequireResourceExists(r, webProxyStateTemplateID) - apiProxyStateTemplate = suite.client.RequireResourceExists(r, apiProxyStateTemplateID) - }) + // Check that proxy state template resource is generated for both the api and web workloads. + retry.Run(suite.T(), func(r *retry.R) { + suite.client.RequireResourceExists(r, apiProxyStateTemplateID) + webProxyStateTemplate = suite.client.RequireResourceExists(r, webProxyStateTemplateID) + apiProxyStateTemplate = suite.client.RequireResourceExists(r, apiProxyStateTemplateID) }) // Write a default ComputedRoutes for api.