Adding TestInstallation.AssertionsT (#10600)

Co-authored-by: jmcguire98 <[email protected]>

Author: ryanrolds

changelog/v1.19.0-beta6/tests-introducing-assertionst.yaml

@@ -0,0 +1,5 @@
+changelog:
+  - type: NON_USER_FACING
+    description: |
+      Introducing TestInstallation.AssertionsT method that provides a better 
+      scoped assertions provider.

test/kubernetes/e2e/features/server_tls/k8s_suite.go

@@ -108,9 +108,8 @@ func (s *k8sServerTlsTestingSuite) TestOneWayServerTlsWorksWithOneWayTls() {
 }
 
 func (s *k8sServerTlsTestingSuite) assertEventualResponse(hostHeaderValue string, matcher *matchers.HttpResponse) {
-
 	// Check curl works against expected response
-	s.testInstallation.Assertions.AssertEventualCurlResponse(
+	s.testInstallation.AssertionsT(s.T()).AssertEventualCurlResponse(
 		s.ctx,
 		kubectl.PodExecOptions{
 			Name:      "curl",
@@ -123,7 +122,7 @@ func (s *k8sServerTlsTestingSuite) assertEventualResponse(hostHeaderValue string
 
 func (s *k8sServerTlsTestingSuite) assertEventualError(hostHeaderValue string, code int) {
 	// Check curl works against expected response
-	s.testInstallation.Assertions.AssertEventualCurlError(
+	s.testInstallation.AssertionsT(s.T()).AssertEventualCurlError(
 		s.ctx,
 		kubectl.PodExecOptions{
 			Name:      "curl",

test/kubernetes/e2e/test.go

@@ -102,6 +102,12 @@ func CreateTestInstallationForCluster(
 			WithClusterContext(clusterContext).
 			WithGlooGatewayContext(glooGatewayContext),
 
+		AssertionsT: func(t *testing.T) *assertions.Provider {
+			return assertions.NewProvider(t).
+				WithClusterContext(clusterContext).
+				WithGlooGatewayContext(glooGatewayContext)
+		},
+
 		// GeneratedFiles contains the unique location where files generated during the execution
 		// of tests against this installation will be stored
 		// By creating a unique location, per TestInstallation and per Cluster.Name we guarantee isolation
@@ -133,8 +139,12 @@ type TestInstallation struct {
 	Actions *actions.Provider
 
 	// Assertions is the entity that creates assertions that can be executed by the Operator
+	// DEPRECATED: Use AssertionsT instead (which is scoped to a specific test and not the root suite)
 	Assertions *assertions.Provider
 
+	// AssertionsT creates an assertion provider that is scoped to the provided test
+	AssertionsT func(*testing.T) *assertions.Provider
+
 	// GeneratedFiles is the collection of directories and files that this test installation _may_ create
 	GeneratedFiles GeneratedFiles