Make tests faster by fast polling

kubernetes-sigs · May 11, 2020 · f8860b2 · f8860b2
1 parent d65e8e2
commit f8860b2
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 10 deletions.
diff --git a/source/gateway.go b/source/gateway.go
@@ -95,7 +95,7 @@ func NewIstioGatewaySource(
 	informerFactory.Start(wait.NeverStop)
 
 	// wait for the local cache to be populated.
-	err = wait.Poll(time.Second, 60*time.Second, func() (bool, error) {
+	err = poll(time.Second, 60*time.Second, func() (bool, error) {
 		return serviceInformer.Informer().HasSynced(), nil
 	})
 	if err != nil {

diff --git a/source/ingress.go b/source/ingress.go
@@ -90,7 +90,7 @@ func NewIngressSource(kubeClient kubernetes.Interface, namespace, annotationFilt
 	informerFactory.Start(wait.NeverStop)
 
 	// wait for the local cache to be populated.
-	err = wait.Poll(time.Second, 60*time.Second, func() (bool, error) {
+	err = poll(time.Second, 60*time.Second, func() (bool, error) {
 		return ingressInformer.Informer().HasSynced(), nil
 	})
 	if err != nil {

diff --git a/source/ingress_test.go b/source/ingress_test.go
@@ -26,7 +26,6 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes/fake"
 
 	"sigs.k8s.io/external-dns/endpoint"
@@ -1018,7 +1017,7 @@ func testIngressEndpoints(t *testing.T) {
 			var err error
 
 			// wait up to a few seconds for new resources to appear in informer cache.
-			err = wait.Poll(time.Second, 3*time.Second, func() (bool, error) {
+			err = poll(time.Second, 3*time.Second, func() (bool, error) {
 				res, err = ingressSource.Endpoints()
 				if err != nil {
 					// stop waiting if we get an error

diff --git a/source/ingressroute.go b/source/ingressroute.go
@@ -104,7 +104,7 @@ func NewContourIngressRouteSource(
 	informerFactory.Start(wait.NeverStop)
 
 	// wait for the local cache to be populated.
-	err = wait.Poll(time.Second, 60*time.Second, func() (bool, error) {
+	err = poll(time.Second, 60*time.Second, func() (bool, error) {
 		return ingressRouteInformer.Informer().HasSynced(), nil
 	})
 	if err != nil {

diff --git a/source/node.go b/source/node.go
@@ -78,7 +78,7 @@ func NewNodeSource(kubeClient kubernetes.Interface, annotationFilter, fqdnTempla
 	informerFactory.Start(wait.NeverStop)
 
 	// wait for the local cache to be populated.
-	err = wait.Poll(time.Second, 60*time.Second, func() (bool, error) {
+	err = poll(time.Second, 60*time.Second, func() (bool, error) {
 		return nodeInformer.Informer().HasSynced(), nil
 	})
 	if err != nil {

diff --git a/source/ocproute.go b/source/ocproute.go
@@ -91,7 +91,7 @@ func NewOcpRouteSource(
 	informerFactory.Start(wait.NeverStop)
 
 	// wait for the local cache to be populated.
-	err = wait.Poll(time.Second, 60*time.Second, func() (bool, error) {
+	err = poll(time.Second, 60*time.Second, func() (bool, error) {
 		return routeInformer.Informer().HasSynced(), nil
 	})
 	if err != nil {

diff --git a/source/service.go b/source/service.go
@@ -120,7 +120,7 @@ func NewServiceSource(kubeClient kubernetes.Interface, namespace, annotationFilt
 	informerFactory.Start(wait.NeverStop)
 
 	// wait for the local cache to be populated.
-	err = wait.Poll(time.Second, 60*time.Second, func() (bool, error) {
+	err = poll(time.Second, 60*time.Second, func() (bool, error) {
 		return serviceInformer.Informer().HasSynced(), nil
 	})
 	if err != nil {

diff --git a/source/service_test.go b/source/service_test.go
@@ -26,7 +26,6 @@ import (
 	"github.com/stretchr/testify/suite"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes/fake"
 
 	"sigs.k8s.io/external-dns/endpoint"
@@ -1118,7 +1117,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			var res []*endpoint.Endpoint
 
 			// wait up to a few seconds for new resources to appear in informer cache.
-			err = wait.Poll(time.Second, 3*time.Second, func() (bool, error) {
+			err = poll(time.Second, 3*time.Second, func() (bool, error) {
 				res, err = client.Endpoints()
 				if err != nil {
 					// stop waiting if we get an error

diff --git a/source/source.go b/source/source.go
@@ -27,6 +27,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/external-dns/endpoint"
 )
 
@@ -224,3 +225,15 @@ func matchLabelSelector(selector labels.Selector, srcAnnotations map[string]stri
 	annotations := labels.Set(srcAnnotations)
 	return selector.Matches(annotations)
 }
+
+// Used for fast testing
+var FAST_POLL = false
+
+func poll(interval time.Duration, timeout time.Duration, condition wait.ConditionFunc) error {
+	if FAST_POLL {
+		interval = 10 * time.Millisecond
+		timeout = 10 * time.Second
+	}
+
+	return wait.Poll(interval, timeout, condition)
+}
diff --git a/source/source_test.go b/source/source_test.go
@@ -19,6 +19,7 @@ package source
 import (
 	"context"
 	"fmt"
+	"os"
 	"testing"
 	"time"
 
@@ -28,6 +29,12 @@ import (
 	"sigs.k8s.io/external-dns/internal/testutils"
 )
 
+func TestMain(m *testing.M) {
+	FAST_POLL = true
+	// call flag.Parse() here if TestMain uses flags
+	os.Exit(m.Run())
+}
+
 func TestGetTTLFromAnnotations(t *testing.T) {
 	for _, tc := range []struct {
 		title       string