Fix ApiUpdated test to properly run its reload

On one hand it was running a reload manually, which was missing the
point of the test. We want the redis event to fire it on its own.

On the other, not sending a reload tick would mean that if the event
indeed fires a reload, it would be queued but not executed, breaking
other tests that depend on an empty reload queue.

api_definition_test.go

@@ -4,7 +4,9 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
+	"sync"
 	"testing"
+	"time"
 
 	"github.com/garyburd/redigo/redis"
 	"github.com/lonelycode/gorpc"
@@ -491,16 +493,20 @@ func TestGetAPISpecsDashboardSuccess(t *testing.T) {
 		config.DBAppConfOptions.ConnectionString = ""
 	}()
 
+	var wg sync.WaitGroup
+	wg.Add(1)
 	msg := redis.Message{Data: []byte(`{"Command": "ApiUpdated"}`)}
-	handleRedisEvent(msg)
+	handleRedisEvent(msg, wg.Done)
 
 	if len(reloadChan) != 1 {
 		t.Fatal("Should trigger reload")
 	}
 
 	// Since we already know that reload is queued
-	doReload()
+	reloadTick <- time.Time{}
 
+	// Wait for the reload to finish, then check it worked
+	wg.Wait()
 	if len(ApiSpecRegister) != 1 {
 		t.Error("Should return array with one spec", ApiSpecRegister)
 	}

redis_signals.go

@@ -20,7 +20,9 @@ func startPubSubLoop() {
 	cacheStore.Connect()
 	// On message, synchronise
 	for {
-		err := cacheStore.StartPubSubHandler(RedisPubSubChannel, handleRedisEvent)
+		err := cacheStore.StartPubSubHandler(RedisPubSubChannel, func(v interface{}) {
+			handleRedisEvent(v, nil)
+		})
 		if err != nil {
 			log.WithFields(logrus.Fields{
 				"prefix": "pub-sub",
@@ -36,7 +38,7 @@ func startPubSubLoop() {
 	}
 }
 
-func handleRedisEvent(v interface{}) {
+func handleRedisEvent(v interface{}, reloadFn func()) {
 	message, ok := v.(redis.Message)
 	if !ok {
 		return
@@ -73,7 +75,10 @@ func handleRedisEvent(v interface{}) {
 	case NoticeGatewayLENotification:
 		onLESSLStatusReceivedHandler(notif.Payload)
 	case NoticeApiUpdated, NoticeApiRemoved, NoticeApiAdded, NoticePolicyChanged, NoticeGroupReload:
-		handleReloadMsg()
+		log.WithFields(logrus.Fields{
+			"prefix": "pub-sub",
+		}).Info("Reloading endpoints")
+		reloadURLStructure(reloadFn)
 	default:
 		log.WithFields(logrus.Fields{
 			"prefix": "pub-sub",
@@ -82,13 +87,6 @@ func handleRedisEvent(v interface{}) {
 
 }
 
-func handleReloadMsg() {
-	log.WithFields(logrus.Fields{
-		"prefix": "pub-sub",
-	}).Info("Reloading endpoints")
-	reloadURLStructure(nil)
-}
-
 var warnedOnce bool
 var notificationVerifier goverify.Verifier