Fixup flaky test

hashicorp · Nov 8, 2022 · dea2bd9 · dea2bd9
1 parent 5581010
commit dea2bd9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/test/integration/consul-container/libs/service/common.go b/test/integration/consul-container/libs/service/common.go
@@ -11,7 +11,7 @@ import (
 
 const (
 	envoyEnvKey   = "ENVOY_VERSION"
-	envoyLogLevel = "info"
+	envoyLogLevel = "debug"
 	envoyVersion  = "1.23.1"
 
 	hashicorpDockerProxy = "docker.mirror.hashicorp.services"

diff --git a/test/integration/consul-container/libs/service/connect.go b/test/integration/consul-container/libs/service/connect.go
@@ -64,7 +64,7 @@ func (c ConnectContainer) Terminate() error {
 	return err
 }
 
-func NewConnectService(ctx context.Context, name string, serviceName string, serviceBindPort int, node libnode.Agent) (Service, error) {
+func NewConnectService(ctx context.Context, name string, serviceName string, serviceBindPort int, node libnode.Agent) (*ConnectContainer, error) {
 	namePrefix := fmt.Sprintf("%s-service-connect-%s", node.GetDatacenter(), name)
 	containerName := utils.RandName(namePrefix)
 

diff --git a/test/integration/consul-container/libs/service/helpers.go b/test/integration/consul-container/libs/service/helpers.go
@@ -41,10 +41,12 @@ func CreateAndRegisterStaticServerAndSidecar(node libnode.Agent) (Service, Servi
 						Name:     "Connect Sidecar Listening",
 						TCP:      fmt.Sprintf("%s:%d", serverConnectProxyIP, 20000),
 						Interval: "10s",
+						Status:   api.HealthPassing,
 					},
 					&api.AgentServiceCheck{
 						Name:         "Connect Sidecar Aliasing Static Server",
 						AliasService: "static-server",
+						Status:       api.HealthPassing,
 					},
 				},
 				Proxy: &api.AgentServiceConnectProxyConfig{
@@ -55,9 +57,10 @@ func CreateAndRegisterStaticServerAndSidecar(node libnode.Agent) (Service, Servi
 			},
 		},
 		Check: &api.AgentServiceCheck{
-			Name:     "Connect Sidecar Listening",
+			Name:     "Static Server Listening",
 			TCP:      fmt.Sprintf("%s:%d", serverServiceIP, 8080),
 			Interval: "10s",
+			Status:   api.HealthPassing,
 		},
 	}
 
@@ -69,7 +72,7 @@ func CreateAndRegisterStaticServerAndSidecar(node libnode.Agent) (Service, Servi
 	return serverService, serverConnectProxy, nil
 }
 
-func CreateAndRegisterStaticClientSidecar(node libnode.Agent, peerName string, localMeshGateway bool) (Service, error) {
+func CreateAndRegisterStaticClientSidecar(node libnode.Agent, peerName string, localMeshGateway bool) (*ConnectContainer, error) {
 	// Create a service and proxy instance
 	clientConnectProxy, err := NewConnectService(context.Background(), "static-client-sidecar", "static-client", 5000, node)
 	if err != nil {
@@ -97,6 +100,7 @@ func CreateAndRegisterStaticClientSidecar(node libnode.Agent, peerName string, l
 						Name:     "Connect Sidecar Listening",
 						TCP:      fmt.Sprintf("%s:%d", clientConnectProxyIP, 20000),
 						Interval: "10s",
+						Status:   api.HealthPassing,
 					},
 				},
 				Proxy: &api.AgentServiceConnectProxyConfig{