From c7bbbef1eb85442a92e25265d5ddfb40472be0ad Mon Sep 17 00:00:00 2001 From: Michael Wilkerson Date: Mon, 10 Jul 2023 16:35:40 -0700 Subject: [PATCH] Fix test flakes. (#2483) --- acceptance/framework/connhelper/connect_helper.go | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/acceptance/framework/connhelper/connect_helper.go b/acceptance/framework/connhelper/connect_helper.go index 670307da88..cc9d58c810 100644 --- a/acceptance/framework/connhelper/connect_helper.go +++ b/acceptance/framework/connhelper/connect_helper.go @@ -94,7 +94,7 @@ func (c *ConnectHelper) DeployClientAndServer(t *testing.T) { // deployments because golang will execute them in reverse order // (i.e. the last registered cleanup function will be executed first). t.Cleanup(func() { - retrier := &retry.Timer{Timeout: 30 * time.Second, Wait: 100 * time.Millisecond} + retrier := &retry.Timer{Timeout: 60 * time.Second, Wait: 100 * time.Millisecond} retry.RunWith(retrier, t, func(r *retry.R) { tokens, _, err := c.ConsulClient.ACL().TokenList(nil) require.NoError(r, err) @@ -132,19 +132,6 @@ func (c *ConnectHelper) DeployClientAndServer(t *testing.T) { }) } -// CreateResolverRedirect creates a resolver that redirects to a static-server, a corresponding k8s service, -// and intentions. This helper is primarly used to ensure that the virtual-ips are persisted to consul properly. -func (c *ConnectHelper) CreateResolverRedirect(t *testing.T) { - logger.Log(t, "creating resolver redirect") - options := c.Ctx.KubectlOptions(t) - kustomizeDir := "../fixtures/cases/resolver-redirect-virtualip" - k8s.KubectlApplyK(t, options, kustomizeDir) - - helpers.Cleanup(t, c.Cfg.NoCleanupOnFailure, func() { - k8s.KubectlDeleteK(t, options, kustomizeDir) - }) -} - // TestConnectionFailureWithoutIntention ensures the connection to the static // server fails when no intentions are configured. func (c *ConnectHelper) TestConnectionFailureWithoutIntention(t *testing.T) {