TEST: modification of custom resource poc integration test

Author: ivanmatmati

deploy/tests/integration/customresources/customresource_test.go

@@ -16,8 +16,6 @@ package customresources
 
 import (
 	"github.com/stretchr/testify/assert"
-
-	"github.com/haproxytech/kubernetes-ingress/deploy/tests/e2e"
 )
 
 func (suite *CustomResourceSuite) TestGlobalCR() {
@@ -28,21 +26,23 @@ func (suite *CustomResourceSuite) TestGlobalCR() {
 	t := suite.T()
 
 	suite.Run("Adding a global CR creates global and logTargets objects", func() {
+		eventProcessedChan := make(chan struct{})
+		globalCREvt.EventProcessed = eventProcessedChan
 		eventChan <- globalCREvt
-		suite.Require().Eventually(func() bool {
-			return assert.Len(t, globals, 1, "Should find one and only one Global CR") ||
-				assert.Len(t, logtrargets, 1, "Should find one and only one LogTargets CR") ||
-				assert.Containsf(t, globals, globalCREvt.Name, "Global CR of name '%s' not found", globalCREvt.Name)
-		}, e2e.WaitDuration, e2e.TickDuration)
+		<-eventProcessedChan
+		assert.Len(t, globals, 1, "Should find one and only one Global CR")
+		assert.Len(t, logtrargets, 1, "Should find one and only one LogTargets CR")
+		assert.Containsf(t, globals, globalCREvt.Name, "Global CR of name '%s' not found", globalCREvt.Name)
 	})
 
 	suite.Run("Deleting a global CR removes global and logTargets objects", func() {
 		globalCREvt.Data = nil
+		eventProcessedChan := make(chan struct{})
+		globalCREvt.EventProcessed = eventProcessedChan
 		eventChan <- globalCREvt
-		suite.Require().Eventually(func() bool {
-			return assert.Len(t, globals, 0, "No Global CR should be present") ||
-				assert.Len(t, logtrargets, 0, "No LogTargets should be present")
-		}, e2e.WaitDuration, e2e.TickDuration)
+		<-eventProcessedChan
+		assert.Len(t, globals, 0, "No Global CR should be present")
+		assert.Len(t, logtrargets, 0, "No LogTargets should be present")
 	})
 
 	close(eventChan)

deploy/tests/integration/customresources/suite_test.go

@@ -16,6 +16,7 @@ package customresources
 
 import (
 	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -52,6 +53,7 @@ func (suite *CustomResourceSuite) BeforeTest(suiteName, testName string) {
 		suite.T().Fatalf("Suite '%s': Test '%s' : error : %s", suiteName, testName, err)
 	}
 	suite.test.TempDir = tempDir
+	suite.T().Logf("temporary configuration dir %s", suite.test.TempDir)
 }
 
 var haproxyConfig = `global
@@ -94,9 +96,13 @@ frontend stats
 
 func (suite *CustomResourceSuite) GlobalCRFixture() (eventChan chan k8s.SyncDataEvent, s store.K8s, globalCREvt k8s.SyncDataEvent) {
 	var osArgs utils.OSArgs
+	os.Args = []string{os.Args[0], "-e", "-t", "--config-dir=" + suite.test.TempDir}
 	parser := flags.NewParser(&osArgs, flags.IgnoreUnknown)
-	_, _ = parser.Parse()
-	osArgs.Test = true
+	_, errParsing := parser.Parse()
+	if errParsing != nil {
+		suite.T().Fatal(errParsing)
+	}
+
 	eventChan = make(chan k8s.SyncDataEvent, watch.DefaultChanSize*6)
 	s = store.NewK8sStore(osArgs)
 	globalCREvt = k8s.SyncDataEvent{