TEST: make access control e2e tests more robust

haproxytech · Dec 11, 2023 · 17ea85e · 17ea85e
1 parent 9e83018
commit 17ea85e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/deploy/tests/e2e/access-control/access_control_test.go b/deploy/tests/e2e/access-control/access_control_test.go
@@ -48,6 +48,7 @@ func (suite *AccessControlSuite) Test_Whitelist() {
 
 		suite.eventuallyReturns("192.168.2.3", http.StatusOK)
 		suite.eventuallyReturns("192.168.5.3", http.StatusForbidden)
+		suite.TearDownSubSuite()
 	})
 
 	suite.Run("Inline deprecated annotation name", func() {
@@ -60,6 +61,7 @@ func (suite *AccessControlSuite) Test_Whitelist() {
 
 		suite.eventuallyReturns("192.168.4.3", http.StatusOK)
 		suite.eventuallyReturns("192.168.5.3", http.StatusForbidden)
+		suite.TearDownSubSuite()
 	})
 
 	suite.Run("Inline: when new and deprecated annotation names are defined then only new name is considered", func() {
@@ -73,6 +75,7 @@ func (suite *AccessControlSuite) Test_Whitelist() {
 
 		suite.eventuallyReturns("192.168.5.3", http.StatusOK)
 		suite.eventuallyReturns("192.168.4.3", http.StatusForbidden)
+		suite.TearDownSubSuite()
 	})
 
 	suite.Run("Patternfile", func() {
@@ -86,6 +89,7 @@ func (suite *AccessControlSuite) Test_Whitelist() {
 
 		suite.eventuallyReturns("192.168.0.3", http.StatusOK)
 		suite.eventuallyReturns("192.168.2.3", http.StatusForbidden)
+		suite.TearDownSubSuite()
 	})
 
 	suite.Run("Patternfile deprecated annotation name", func() {
@@ -99,6 +103,7 @@ func (suite *AccessControlSuite) Test_Whitelist() {
 
 		suite.eventuallyReturns("192.169.0.3", http.StatusOK)
 		suite.eventuallyReturns("192.168.2.3", http.StatusForbidden)
+		suite.TearDownSubSuite()
 	})
 
 	suite.Run("Patternfile: when new and deprecated annotation names are defined then only new name is considered", func() {
@@ -113,6 +118,7 @@ func (suite *AccessControlSuite) Test_Whitelist() {
 
 		suite.eventuallyReturns("192.168.0.3", http.StatusOK)
 		suite.eventuallyReturns("192.168.2.3", http.StatusForbidden)
+		suite.TearDownSubSuite()
 	})
 }
 
@@ -127,6 +133,7 @@ func (suite *AccessControlSuite) Test_Blacklist() {
 
 		suite.eventuallyReturns("192.168.2.3", http.StatusForbidden)
 		suite.eventuallyReturns("192.168.5.3", http.StatusOK)
+		suite.TearDownSubSuite()
 	})
 
 	suite.Run("Inline deprecated annotation name", func() {
@@ -139,6 +146,7 @@ func (suite *AccessControlSuite) Test_Blacklist() {
 
 		suite.eventuallyReturns("192.168.4.3", http.StatusForbidden)
 		suite.eventuallyReturns("192.168.5.3", http.StatusOK)
+		suite.TearDownSubSuite()
 	})
 
 	suite.Run("Inline: when new and deprecated annotation names are defined then only new name is considered", func() {
@@ -152,6 +160,7 @@ func (suite *AccessControlSuite) Test_Blacklist() {
 
 		suite.eventuallyReturns("192.168.5.3", http.StatusForbidden)
 		suite.eventuallyReturns("192.168.4.3", http.StatusOK)
+		suite.TearDownSubSuite()
 	})
 
 	suite.Run("Patternfile", func() {
@@ -165,6 +174,7 @@ func (suite *AccessControlSuite) Test_Blacklist() {
 
 		suite.eventuallyReturns("192.168.0.3", http.StatusForbidden)
 		suite.eventuallyReturns("192.168.2.3", http.StatusOK)
+		suite.TearDownSubSuite()
 	})
 
 	suite.Run("Patternfile deprecated annotation name", func() {
@@ -178,6 +188,7 @@ func (suite *AccessControlSuite) Test_Blacklist() {
 
 		suite.eventuallyReturns("192.169.0.3", http.StatusForbidden)
 		suite.eventuallyReturns("192.168.2.3", http.StatusOK)
+		suite.TearDownSubSuite()
 	})
 	suite.Run("Patternfile: when new and deprecated annotation names are defined then only new name is considered", func() {
 		suite.tmplData.IngAnnotations = []struct{ Key, Value string }{
@@ -191,5 +202,6 @@ func (suite *AccessControlSuite) Test_Blacklist() {
 
 		suite.eventuallyReturns("192.168.0.3", http.StatusForbidden)
 		suite.eventuallyReturns("192.169.2.3", http.StatusOK)
+		suite.TearDownSubSuite()
 	})
 }
diff --git a/deploy/tests/e2e/access-control/suite_test.go b/deploy/tests/e2e/access-control/suite_test.go
@@ -52,6 +52,10 @@ func (suite *AccessControlSuite) TearDownSuite() {
 	suite.test.TearDown()
 }
 
+func (suite *AccessControlSuite) TearDownSubSuite() {
+	suite.test.Apply("config/patternfile-empty.yml", "", nil)
+}
+
 func TestAccessControlSuite(t *testing.T) {
 	suite.Run(t, new(AccessControlSuite))
 }