TEST/MINOR: fix usage of testify NoError

the way we were using suite.NoError was not stopping the test in case of error. Fixing this.
haproxytech · Oct 18, 2024 · ea3ffa0 · ea3ffa0
1 parent 957d3d3
commit ea3ffa0
Show file tree

Hide file tree

Showing 42 changed files with 137 additions and 137 deletions.
diff --git a/deploy/tests/e2e/access-control/access_control_test.go b/deploy/tests/e2e/access-control/access_control_test.go
@@ -44,7 +44,7 @@ func (suite *AccessControlSuite) Test_Whitelist() {
 			{"allow-list", " 192.168.2.0/24"},
 		}
 
-		suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 
 		suite.eventuallyReturns("192.168.2.3", http.StatusOK)
 		suite.eventuallyReturns("192.168.5.3", http.StatusForbidden)
@@ -57,7 +57,7 @@ func (suite *AccessControlSuite) Test_Whitelist() {
 			{"whitelist", "192.168.4.0/24"},
 		}
 
-		suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 
 		suite.eventuallyReturns("192.168.4.3", http.StatusOK)
 		suite.eventuallyReturns("192.168.5.3", http.StatusForbidden)
@@ -71,7 +71,7 @@ func (suite *AccessControlSuite) Test_Whitelist() {
 			{"allow-list", "192.168.5.0/24"},
 		}
 
-		suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 
 		suite.eventuallyReturns("192.168.5.3", http.StatusOK)
 		suite.eventuallyReturns("192.168.4.3", http.StatusForbidden)
@@ -84,8 +84,8 @@ func (suite *AccessControlSuite) Test_Whitelist() {
 			{"allow-list", " patterns/ips"},
 		}
 
-		suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
-		suite.NoError(suite.test.Apply("config/patternfile-a.yml", "", nil))
+		suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/patternfile-a.yml", "", nil))
 
 		suite.eventuallyReturns("192.168.0.3", http.StatusOK)
 		suite.eventuallyReturns("192.168.2.3", http.StatusForbidden)
@@ -98,8 +98,8 @@ func (suite *AccessControlSuite) Test_Whitelist() {
 			{"whitelist", " patterns/ips2"},
 		}
 
-		suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
-		suite.NoError(suite.test.Apply("config/patternfile-a.yml", "", nil))
+		suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/patternfile-a.yml", "", nil))
 
 		suite.eventuallyReturns("192.169.0.3", http.StatusOK)
 		suite.eventuallyReturns("192.168.2.3", http.StatusForbidden)
@@ -113,8 +113,8 @@ func (suite *AccessControlSuite) Test_Whitelist() {
 			{"allow-list", " patterns/ips"},
 		}
 
-		suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
-		suite.NoError(suite.test.Apply("config/patternfile-a.yml", "", nil))
+		suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/patternfile-a.yml", "", nil))
 
 		suite.eventuallyReturns("192.168.0.3", http.StatusOK)
 		suite.eventuallyReturns("192.168.2.3", http.StatusForbidden)
@@ -129,7 +129,7 @@ func (suite *AccessControlSuite) Test_Blacklist() {
 			{"deny-list", " 192.168.2.0/24"},
 		}
 
-		suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 
 		suite.eventuallyReturns("192.168.2.3", http.StatusForbidden)
 		suite.eventuallyReturns("192.168.5.3", http.StatusOK)
@@ -142,7 +142,7 @@ func (suite *AccessControlSuite) Test_Blacklist() {
 			{"blacklist", "192.168.4.0/24"},
 		}
 
-		suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 
 		suite.eventuallyReturns("192.168.4.3", http.StatusForbidden)
 		suite.eventuallyReturns("192.168.5.3", http.StatusOK)
@@ -156,7 +156,7 @@ func (suite *AccessControlSuite) Test_Blacklist() {
 			{"deny-list", "192.168.5.0/24"},
 		}
 
-		suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 
 		suite.eventuallyReturns("192.168.5.3", http.StatusForbidden)
 		suite.eventuallyReturns("192.168.4.3", http.StatusOK)
@@ -169,8 +169,8 @@ func (suite *AccessControlSuite) Test_Blacklist() {
 			{"deny-list", "patterns/ips"},
 		}
 
-		suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
-		suite.NoError(suite.test.Apply("config/patternfile-a.yml", "", nil))
+		suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/patternfile-a.yml", "", nil))
 
 		suite.eventuallyReturns("192.168.0.3", http.StatusForbidden)
 		suite.eventuallyReturns("192.168.2.3", http.StatusOK)
@@ -183,8 +183,8 @@ func (suite *AccessControlSuite) Test_Blacklist() {
 			{"blacklist", " patterns/ips2"},
 		}
 
-		suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
-		suite.NoError(suite.test.Apply("config/patternfile-a.yml", "", nil))
+		suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/patternfile-a.yml", "", nil))
 
 		suite.eventuallyReturns("192.169.0.3", http.StatusForbidden)
 		suite.eventuallyReturns("192.168.2.3", http.StatusOK)
@@ -197,8 +197,8 @@ func (suite *AccessControlSuite) Test_Blacklist() {
 			{"deny-list", "patterns/ips"},
 		}
 
-		suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
-		suite.NoError(suite.test.Apply("config/patternfile-a.yml", "", nil))
+		suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/patternfile-a.yml", "", nil))
 
 		suite.eventuallyReturns("192.168.0.3", http.StatusForbidden)
 		suite.eventuallyReturns("192.169.2.3", http.StatusOK)

diff --git a/deploy/tests/e2e/access-control/suite_test.go b/deploy/tests/e2e/access-control/suite_test.go
@@ -39,12 +39,12 @@ type tmplData struct {
 func (suite *AccessControlSuite) SetupSuite() {
 	var err error
 	suite.test, err = e2e.NewTest()
-	suite.NoError(err)
+	suite.Require().NoError(err)
 	suite.tmplData = tmplData{Host: suite.test.GetNS() + ".test"}
 	suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
-	suite.NoError(err)
+	suite.Require().NoError(err)
 
-	suite.NoError(suite.test.Apply("config/patternfile-empty.yml", "", nil))
+	suite.Require().NoError(suite.test.Apply("config/patternfile-empty.yml", "", nil))
 }
 
 func (suite *AccessControlSuite) TearDownSuite() {

diff --git a/deploy/tests/e2e/admin-port/suite_test.go b/deploy/tests/e2e/admin-port/suite_test.go
@@ -38,10 +38,10 @@ type tmplData struct {
 func (suite *AdminPortSuite) SetupSuite() {
 	var err error
 	suite.test, err = e2e.NewTest()
-	suite.NoError(err)
+	suite.Require().NoError(err)
 	suite.tmplData = tmplData{Host: suite.test.GetNS() + ".test"}
 	suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
-	suite.NoError(err)
+	suite.Require().NoError(err)
 }
 
 func (suite *AdminPortSuite) TearDownSuite() {

diff --git a/deploy/tests/e2e/basic-auth/basic_auth_test.go b/deploy/tests/e2e/basic-auth/basic_auth_test.go
@@ -24,7 +24,7 @@ import (
 
 func (suite *HTTPBasicAuthSuite) Test_BasicAuth() {
 	suite.Run("Denied", func() {
-		suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 		suite.Require().Eventually(func() bool {
 			res, cls, err := suite.client.Do()
 			if res == nil {

diff --git a/deploy/tests/e2e/basic-auth/suite_test.go b/deploy/tests/e2e/basic-auth/suite_test.go
@@ -38,10 +38,10 @@ type tmplData struct {
 func (suite *HTTPBasicAuthSuite) SetupSuite() {
 	var err error
 	suite.test, err = e2e.NewTest()
-	suite.NoError(err)
+	suite.Require().NoError(err)
 	suite.tmplData = tmplData{Host: suite.test.GetNS() + ".test"}
 	suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
-	suite.NoError(err)
+	suite.Require().NoError(err)
 }
 
 func (suite *HTTPBasicAuthSuite) TearDownSuite() {

diff --git a/deploy/tests/e2e/canary-deployment/percentage_test.go b/deploy/tests/e2e/canary-deployment/percentage_test.go
@@ -28,7 +28,7 @@ func (suite *CanaryDeploymentSuite) Test_Response_Percentage() {
 	for _, percentage := range []int{0, 25, 100} {
 		suite.Run(fmt.Sprintf("%d", percentage), func() {
 			suite.tmplData.StagingRouteACL = fmt.Sprintf("rand(100) lt %d", percentage)
-			suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+			suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 			suite.Eventually(func() bool {
 				counter := 0
 				for i := 0; i < 10; i++ {

diff --git a/deploy/tests/e2e/canary-deployment/suite_test.go b/deploy/tests/e2e/canary-deployment/suite_test.go
@@ -41,13 +41,13 @@ type tmplData struct {
 func (suite *CanaryDeploymentSuite) SetupSuite() {
 	var err error
 	suite.test, err = e2e.NewTest()
-	suite.NoError(err)
+	suite.Require().NoError(err)
 	suite.tmplData = tmplData{
 		Host:            suite.test.GetNS() + ".test",
 		StagingRouteACL: "rand(100) lt 0",
 	}
 	suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
-	suite.NoError(err)
+	suite.Require().NoError(err)
 	suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 	suite.Require().Eventually(func() bool {
 		res, cls, err := suite.client.Do()

diff --git a/deploy/tests/e2e/config-snippet/backend_cfg_snippet_test.go b/deploy/tests/e2e/config-snippet/backend_cfg_snippet_test.go
@@ -24,7 +24,7 @@ import (
 )
 
 func (suite *ConfigSnippetSuite) TestBackendCfgSnippet() {
-	suite.NoError(suite.test.Apply("config/backend-cfg-snippet.yaml", suite.test.GetNS(), nil))
+	suite.Require().NoError(suite.test.Apply("config/backend-cfg-snippet.yaml", suite.test.GetNS(), nil))
 	suite.Eventually(func() bool {
 		res, cls, err := suite.client.Do()
 		if err != nil {

diff --git a/deploy/tests/e2e/config-snippet/frontend_cfg_snippet_test.go b/deploy/tests/e2e/config-snippet/frontend_cfg_snippet_test.go
@@ -24,7 +24,7 @@ import (
 )
 
 func (suite *ConfigSnippetSuite) TestFrontendCfgSnippet() {
-	suite.NoError(suite.test.Apply("config/configmap.yaml", "", nil))
+	suite.Require().NoError(suite.test.Apply("config/configmap.yaml", "", nil))
 	suite.Eventually(func() bool {
 		res, cls, err := suite.client.Do()
 		if err != nil {

diff --git a/deploy/tests/e2e/config-snippet/suite_test.go b/deploy/tests/e2e/config-snippet/suite_test.go
@@ -38,11 +38,11 @@ type tmplData struct {
 func (suite *ConfigSnippetSuite) SetupSuite() {
 	var err error
 	suite.test, err = e2e.NewTest()
-	suite.NoError(err)
+	suite.Require().NoError(err)
 	suite.tmplData = tmplData{Host: suite.test.GetNS() + ".test"}
 	suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
-	suite.NoError(err)
-	suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+	suite.Require().NoError(err)
+	suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 	suite.Require().Eventually(func() bool {
 		res, cls, err := suite.client.Do()
 		if res == nil {

diff --git a/deploy/tests/e2e/cors/cors_test.go b/deploy/tests/e2e/cors/cors_test.go
@@ -46,7 +46,7 @@ func (suite *CorsSuite) Test_Configmap_Alone() {
 	suite.Run("CorsMethodsCredentialAlone", suite.CorsMethodsCredentialAlone(false))
 	suite.Run("CorsDisable", suite.CorsDisable(false))
 	suite.Run("CorsMethodsCredentialDisable", suite.CorsMethodsCredentialDisable(false))
-	suite.NoError(suite.test.Apply("../../config/2.configmap.yaml", "", nil))
+	suite.Require().NoError(suite.test.Apply("../../config/2.configmap.yaml", "", nil))
 }
 
 func (suite *CorsSuite) Test_Ingress_Alone() {
@@ -116,7 +116,7 @@ func (suite *CorsSuite) Default(ingressCors bool) func() {
 			yamlFile = "config/configmap.yaml.tmpl"
 			ns = ""
 		}
-		suite.NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
+		suite.Require().NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
 
 		suite.eventuallyReturns(expectedHeaders, unexpectedHeaders)
 	}
@@ -148,7 +148,7 @@ func (suite *CorsSuite) CorsOriginAlone(ingressCors bool) func() {
 			yamlFile = "config/configmap.yaml.tmpl"
 			ns = ""
 		}
-		suite.NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
+		suite.Require().NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
 
 		suite.eventuallyReturns(expectedHeaders, unexpectedHeaders)
 	}
@@ -180,7 +180,7 @@ func (suite *CorsSuite) CorsMethodsAlone(ingressCors bool) func() {
 			yamlFile = "config/configmap.yaml.tmpl"
 			ns = ""
 		}
-		suite.NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
+		suite.Require().NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
 
 		suite.eventuallyReturns(expectedHeaders, unexpectedHeaders)
 	}
@@ -212,7 +212,7 @@ func (suite *CorsSuite) CorsMethodsHeadersAlone(ingressCors bool) func() {
 			yamlFile = "config/configmap.yaml.tmpl"
 			ns = ""
 		}
-		suite.NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
+		suite.Require().NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
 
 		suite.eventuallyReturns(expectedHeaders, unexpectedHeaders)
 	}
@@ -244,7 +244,7 @@ func (suite *CorsSuite) CorsMethodsAgeAlone(ingressCors bool) func() {
 			yamlFile = "config/configmap.yaml.tmpl"
 			ns = ""
 		}
-		suite.NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
+		suite.Require().NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
 
 		suite.eventuallyReturns(expectedHeaders, unexpectedHeaders)
 	}
@@ -276,7 +276,7 @@ func (suite *CorsSuite) CorsMethodsCredentialDisable(ingressCors bool) func() {
 			yamlFile = "config/configmap.yaml.tmpl"
 			ns = ""
 		}
-		suite.NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
+		suite.Require().NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
 
 		suite.eventuallyReturns(expectedHeaders, unexpectedHeaders)
 	}
@@ -305,7 +305,7 @@ func (suite *CorsSuite) CorsMethodsCredentialAlone(ingressCors bool) func() {
 			yamlFile = "config/configmap.yaml.tmpl"
 			ns = ""
 		}
-		suite.NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
+		suite.Require().NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
 
 		suite.eventuallyReturns(expectedHeaders, http.Header{})
 	}
@@ -339,7 +339,7 @@ func (suite *CorsSuite) CorsDisable(ingressCors bool) func() {
 			yamlFile = "config/configmap.yaml.tmpl"
 			ns = ""
 		}
-		suite.NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
+		suite.Require().NoError(suite.test.Apply(yamlFile, ns, suite.tmplData))
 		suite.eventuallyReturns(http.Header{}, unexpectedHeaders)
 	}
 }
diff --git a/deploy/tests/e2e/cors/suite_test.go b/deploy/tests/e2e/cors/suite_test.go
@@ -40,18 +40,18 @@ type tmplData struct {
 func (suite *CorsSuite) SetupSuite() {
 	var err error
 	suite.test, err = e2e.NewTest()
-	suite.NoError(err)
+	suite.Require().NoError(err)
 	suite.tmplData = tmplData{Host: suite.test.GetNS() + ".test"}
 	suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
-	suite.NoError(err)
+	suite.Require().NoError(err)
 
-	suite.NoError(suite.test.Apply("../../config/2.configmap.yaml", "", nil))
-	suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), tmplData{Host: suite.test.GetNS() + ".test"}))
+	suite.Require().NoError(suite.test.Apply("../../config/2.configmap.yaml", "", nil))
+	suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), tmplData{Host: suite.test.GetNS() + ".test"}))
 }
 
 func (suite *CorsSuite) TearDownSuite() {
 	// suite.test.Apply("../../config/2.configmap.yaml", "", nil)
-	suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), tmplData{Host: suite.test.GetNS() + ".test"}))
+	suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), tmplData{Host: suite.test.GetNS() + ".test"}))
 	suite.test.TearDown()
 }
 

diff --git a/deploy/tests/e2e/crd/cr_global_test.go b/deploy/tests/e2e/crd/cr_global_test.go
@@ -53,10 +53,10 @@ func (suite *GlobalSuite) Test_CR_Global() {
 
 		// Get updated config and do all neede param checks
 		cfg, err := suite.test.GetIngressControllerFile("/etc/haproxy/haproxy.cfg")
-		suite.NoError(err, "Could not get Haproxy config")
+		suite.Require().NoError(err, "Could not get Haproxy config")
 		reader := strings.NewReader(cfg)
 		p, err := parser.New(options.Reader(reader))
-		suite.NoError(err, "Could not get Haproxy config parser")
+		suite.Require().NoError(err, "Could not get Haproxy config parser")
 		suite.checkGlobalParam(p, "default-path", &types.DefaultPath{
 			Type: "config",
 		})
@@ -213,12 +213,12 @@ func (suite *GlobalSuite) Test_CR_Global() {
 
 func (suite *GlobalSuite) checkGlobalParam(p parser.Parser, param string, value common.ParserData) {
 	v, err := p.Get(parser.Global, parser.GlobalSectionName, param)
-	suite.NoError(err, "Could not get Haproxy config parser Global param %s", param)
+	suite.Require().NoError(err, "Could not get Haproxy config parser Global param %s", param)
 	suite.Equal(value, v, fmt.Sprintf("Global param %s should be equal to %v but is %v", param, value, v))
 }
 
 func (suite *GlobalSuite) checkLogTargetParam(p parser.Parser, param string, value common.ParserData) {
 	v, err := p.GetOne(parser.Global, parser.GlobalSectionName, param, 0)
-	suite.NoError(err, "Could not get Haproxy config parser Global param %s", param)
+	suite.Require().NoError(err, "Could not get Haproxy config parser Global param %s", param)
 	suite.Equal(value, v, fmt.Sprintf("Global param %s should be equal to %v but is %v", param, value, v))
 }
diff --git a/deploy/tests/e2e/crd/suite_test.go b/deploy/tests/e2e/crd/suite_test.go
@@ -50,12 +50,12 @@ type tmplData struct {
 func (suite *CRDSuite) SetupSuite() {
 	var err error
 	suite.test, err = e2e.NewTest()
-	suite.NoError(err)
+	suite.Require().NoError(err)
 	suite.tmplData = tmplData{Host: suite.test.GetNS() + ".test"}
 	suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
-	suite.NoError(err)
-	suite.NoError(suite.test.Apply("config/deploy.yaml", suite.test.GetNS(), nil))
-	suite.NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+	suite.Require().NoError(err)
+	suite.Require().NoError(suite.test.Apply("config/deploy.yaml", suite.test.GetNS(), nil))
+	suite.Require().NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 	suite.Require().Eventually(func() bool {
 		r, cls, err := suite.client.Do()
 		if err != nil {
@@ -72,10 +72,10 @@ func (suite *CRDSuite) TearDownSuite() {
 
 func (suite *CRDSuite) getVersion() int64 {
 	cfg, err := suite.test.GetIngressControllerFile("/etc/haproxy/haproxy.cfg")
-	suite.NoError(err, "Could not get Haproxy config")
+	suite.Require().NoError(err, "Could not get Haproxy config")
 	reader := strings.NewReader(cfg)
 	p, err := parser.New(options.Reader(reader))
-	suite.NoError(err, "Could not get Haproxy config parser")
+	suite.Require().NoError(err, "Could not get Haproxy config parser")
 
 	data, _ := p.Get(parser.Comments, parser.CommentsSectionName, "# _version", false)