helpers.CheckConnection -> helpers.CheckStaticServerConnection

ndhanushkodi · Aug 26, 2020 · 9e78e7f · 9e78e7f
1 parent 9b70648
commit 9e78e7f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/test/acceptance/helpers/helpers.go b/test/acceptance/helpers/helpers.go
@@ -88,11 +88,13 @@ func Deploy(t *testing.T, options *k8s.KubectlOptions, noCleanupOnFailure bool,
 	RunKubectl(t, options, "wait", "--for=condition=available", fmt.Sprintf("deploy/%s", deployment.Name))
 }
 
-// checkConnection execs into a pod of the deployment given by deploymentName
+// CheckStaticServerConnection execs into a pod of the deployment given by deploymentName
 // and runs a curl command with the provided curlArgs.
+// This function assumes that the connection is made to the static-server and expects the output
+// to be "hello world" in a case of success.
 // If expectSuccess is true, it will expect connection to succeed,
 // otherwise it will expect failure due to intentions.
-func CheckConnection(t *testing.T, options *k8s.KubectlOptions, deploymentName string, expectSuccess bool, curlArgs ...string) {
+func CheckStaticServerConnection(t *testing.T, options *k8s.KubectlOptions, deploymentName string, expectSuccess bool, curlArgs ...string) {
 	t.Helper()
 
 	retrier := &retry.Timer{Timeout: 20 * time.Second, Wait: 500 * time.Millisecond}

diff --git a/test/acceptance/tests/connect/connect_inject_test.go b/test/acceptance/tests/connect/connect_inject_test.go
@@ -28,7 +28,7 @@ func TestConnectInjectDefault(t *testing.T) {
 	helpers.Deploy(t, ctx.KubectlOptions(), cfg.NoCleanupOnFailure, "fixtures/static-client.yaml")
 
 	t.Log("checking that connection is successful")
-	helpers.CheckConnection(t, ctx.KubectlOptions(), "static-client", true, "http://localhost:1234")
+	helpers.CheckStaticServerConnection(t, ctx.KubectlOptions(), "static-client", true, "http://localhost:1234")
 }
 
 // Test that Connect works in a secure installation,
@@ -53,7 +53,7 @@ func TestConnectInjectSecure(t *testing.T) {
 	helpers.Deploy(t, ctx.KubectlOptions(), cfg.NoCleanupOnFailure, "fixtures/static-client.yaml")
 
 	t.Log("checking that the connection is not successful because there's no intention")
-	helpers.CheckConnection(t, ctx.KubectlOptions(), "static-client", false, "http://localhost:1234")
+	helpers.CheckStaticServerConnection(t, ctx.KubectlOptions(), "static-client", false, "http://localhost:1234")
 
 	consulClient := consulCluster.SetupConsulClient(t, true)
 
@@ -66,5 +66,5 @@ func TestConnectInjectSecure(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Log("checking that connection is successful")
-	helpers.CheckConnection(t, ctx.KubectlOptions(), "static-client", true, "http://localhost:1234")
+	helpers.CheckStaticServerConnection(t, ctx.KubectlOptions(), "static-client", true, "http://localhost:1234")
 }
diff --git a/test/acceptance/tests/ingress-gateway/ingress_gateway_test.go b/test/acceptance/tests/ingress-gateway/ingress_gateway_test.go
@@ -73,7 +73,7 @@ func TestIngressGateway(t *testing.T) {
 				// via the bounce pod. It should fail to connect with the
 				// static-server pod because of intentions.
 				t.Log("testing intentions prevent ingress")
-				helpers.CheckConnection(t,
+				helpers.CheckStaticServerConnection(t,
 					k8sOptions,
 					"bounce",
 					false,
@@ -93,7 +93,7 @@ func TestIngressGateway(t *testing.T) {
 			// Test that we can make a call to the ingress gateway
 			// via the bounce pod. It should route to the static-server pod.
 			t.Log("trying calls to ingress gateway")
-			helpers.CheckConnection(t,
+			helpers.CheckStaticServerConnection(t,
 				k8sOptions,
 				"bounce",
 				true,

diff --git a/test/acceptance/tests/mesh-gateway/mesh_gateway_test.go b/test/acceptance/tests/mesh-gateway/mesh_gateway_test.go
@@ -93,7 +93,7 @@ func TestMeshGatewayDefault(t *testing.T) {
 	helpers.Deploy(t, primaryContext.KubectlOptions(), cfg.NoCleanupOnFailure, "fixtures/static-client.yaml")
 
 	t.Log("checking that connection is successful")
-	helpers.CheckConnection(t,
+	helpers.CheckStaticServerConnection(t,
 		primaryContext.KubectlOptions(),
 		"static-client",
 		true,
@@ -215,7 +215,7 @@ func TestMeshGatewaySecure(t *testing.T) {
 			require.NoError(t, err)
 
 			t.Log("checking that connection is successful")
-			helpers.CheckConnection(t,
+			helpers.CheckStaticServerConnection(t,
 				primaryContext.KubectlOptions(),
 				"static-client",
 				true,

diff --git a/test/acceptance/tests/terminating-gateway/terminating_gateway_test.go b/test/acceptance/tests/terminating-gateway/terminating_gateway_test.go
@@ -63,7 +63,7 @@ func TestTerminatingGateway(t *testing.T) {
 
 	// Test that we can make a call to the terminating gateway
 	t.Log("trying calls to terminating gateway")
-	helpers.CheckConnection(t,
+	helpers.CheckStaticServerConnection(t,
 		ctx.KubectlOptions(),
 		"static-client",
 		true,