Merge pull request #14 from hellofresh/tests/add-watch-k8s

Replace sleep with watch

pkg/controller/test_helper.go

@@ -9,9 +9,11 @@ import (
 
 	coreV1 "k8s.io/api/core/v1"
 	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/watch"
 	typeV1 "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
+	watchtools "k8s.io/client-go/tools/watch"
 
 	apisLoadTestV1 "github.com/hellofresh/kangal/pkg/kubernetes/apis/loadtest/v1"
 	clientSetV "github.com/hellofresh/kangal/pkg/kubernetes/generated/clientset/versioned"
@@ -65,6 +67,34 @@ func readFile(filename string) (string, error) {
 	return str, nil
 }
 
+func waitLoadtestFunc(event watch.Event) (bool, error) {
+	switch event.Type {
+	case watch.Added:
+		return true, nil
+	case watch.Modified:
+		return true, nil
+	default:
+		return false, nil
+	}
+}
+
+// WaitLoadtest waits until Loadtest resources exists
+func WaitLoadtest(clientSet clientSetV.Clientset, loadtestName string) error {
+	ctx, cancel := context.WithTimeout(context.Background(), KubeTimeout)
+	defer cancel()
+
+	watchObj, err := clientSet.KangalV1().LoadTests().Watch(ctx, metaV1.ListOptions{
+		FieldSelector: fmt.Sprintf("metadata.name=%s", loadtestName),
+	})
+	if err != nil {
+		return err
+	}
+
+	_, err = watchtools.UntilWithoutRetry(ctx, watchObj, waitLoadtestFunc)
+
+	return err
+}
+
 // DeleteLoadTest deletes a load test CR
 func DeleteLoadTest(clientSet clientSetV.Clientset, loadtestName string, testname string) error {
 	fmt.Printf("Deleting object %v for the test %v \n", loadtestName, testname)

pkg/proxy/proxy_integration_test.go

@@ -51,17 +51,18 @@ func TestIntegrationCreateLoadtestFormPostAllFiles(t *testing.T) {
 
 	resp, err := http.Post(fmt.Sprintf("http://localhost:%d/load-test", HTTPPort), request.contentType, request.body)
 	require.NoError(t, err, "Could not create POST request")
-	//added sleep to wait for kangal controller to create a CR from post
-	time.Sleep(1 * time.Second)
-
 	require.Equal(t, http.StatusCreated, resp.StatusCode)
+
 	createdLoadTestName := parseBody(resp)
 
 	t.Cleanup(func() {
 		err := testhelper.DeleteLoadTest(clientSet, createdLoadTestName, t.Name())
 		assert.NoError(t, err)
 	})
 
+	err = testhelper.WaitLoadtest(clientSet, createdLoadTestName)
+	require.NoError(t, err)
+
 	data, err := testhelper.GetLoadtestTestdata(clientSet, createdLoadTestName)
 	require.NoError(t, err)
 	assert.Equal(t, testdataString, data)