TEST/MINOR: fix some unit tests and e2e tests random failures

haproxytech · Jan 9, 2025 · 43c9a24 · 43c9a24
1 parent 455cc9b
commit 43c9a24
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/deploy/tests/integration/config-snippet/suite_test.go b/deploy/tests/integration/config-snippet/suite_test.go
@@ -15,6 +15,7 @@
 package configsnippet_test
 
 import (
+	"os"
 	"testing"
 
 	"github.com/haproxytech/kubernetes-ingress/deploy/tests/integration"
@@ -44,6 +45,8 @@ func (suite *DisableConfigSnippetSuite) BeforeTest(suiteName, testName string) {
 	suite.BaseSuite.BeforeTest(suiteName, testName)
 	// Add any needed update to the controller setting
 	// by updating suite.TestControllers[suite.T().Name()].XXXXX
+	os.Unsetenv("POD_NAME")
+	os.Unsetenv("POD_NAMESPACE")
 	testController := suite.TestControllers[suite.T().Name()]
 	testController.OSArgs.ConfigMap.Name = configMapName
 	testController.OSArgs.ConfigMap.Namespace = configMapNamespace

diff --git a/deploy/tests/integration/pod-maxconn/suite_test.go b/deploy/tests/integration/pod-maxconn/suite_test.go
@@ -15,6 +15,7 @@
 package podmaxconn
 
 import (
+	"os"
 	"testing"
 
 	"github.com/haproxytech/kubernetes-ingress/deploy/tests/integration"
@@ -44,6 +45,8 @@ func (suite *PodMaxConnSuite) BeforeTest(suiteName, testName string) {
 	suite.BaseSuite.BeforeTest(suiteName, testName)
 	// Add any needed update to the controller setting
 	// by updating suite.TestControllers[suite.T().Name()].XXXXX
+	os.Unsetenv("POD_NAME")
+	os.Unsetenv("POD_NAMESPACE")
 	testController := suite.TestControllers[suite.T().Name()]
 	testController.OSArgs.ConfigMap.Name = configMapName
 	testController.OSArgs.ConfigMap.Namespace = configMapNamespace

diff --git a/deploy/tests/integration/timeout-server/suite_test.go b/deploy/tests/integration/timeout-server/suite_test.go
@@ -15,6 +15,7 @@
 package timeoutserver
 
 import (
+	"os"
 	"testing"
 
 	"github.com/haproxytech/kubernetes-ingress/deploy/tests/integration"
@@ -44,6 +45,8 @@ func (suite *TimeoutServerSuite) BeforeTest(suiteName, testName string) {
 	suite.BaseSuite.BeforeTest(suiteName, testName)
 	// Add any needed update to the controller setting
 	// by updating suite.TestControllers[suite.T().Name()].XXXXX
+	os.Unsetenv("POD_NAME")
+	os.Unsetenv("POD_NAMESPACE")
 	testController := suite.TestControllers[suite.T().Name()]
 	testController.OSArgs.ConfigMap.Name = configMapName
 	testController.OSArgs.ConfigMap.Namespace = configMapNamespace