Make retry/polling intervals overridable vars to speed up tests

nfregistration/nf_registration.go

@@ -23,11 +23,11 @@ var (
 	keepAliveTimerMutex sync.Mutex
 	registerCtxMutex    sync.Mutex
 	afterFunc           = time.AfterFunc
+	retryTime           = 10 * time.Second
 )
 
 const (
 	defaultHeartbeatTimer int32 = 60
-	retryTime                   = 10 * time.Second
 )
 
 // StartNfRegistrationService starts the registration service. If the new config is empty, the NF

nfregistration/nf_registration_test.go

@@ -246,12 +246,17 @@ func TestNfRegistrationService_WhenEmptyConfig_ThenContinuesListeningForUpdates(
 
 func TestNfRegistrationService_ConfigChanged_RetryIfRegisterNFFails(t *testing.T) {
 	originalSendRegisterNFInstance := consumer.SendRegisterNFInstance
+	originalRetryTime := retryTime
+	retryTime = 20 * time.Millisecond
 	ch := make(chan []models.PlmnId, 1)
 	cancel, done := startRegistrationServiceForTest(t, ch)
 	defer func() {
 		cancel()
 		<-done
 		consumer.SendRegisterNFInstance = originalSendRegisterNFInstance
+		registerCtxMutex.Lock()
+		retryTime = originalRetryTime
+		registerCtxMutex.Unlock()
 		withKeepAliveTimerLock(func() {
 			stopKeepAliveTimer()
 		})

polling/nf_configuration.go

@@ -19,11 +19,14 @@ import (
 	"github.com/omec-project/openapi/v2/models"
 )
 
-const (
+var (
 	initialPollingInterval = 5 * time.Second
 	pollingMaxBackoff      = 40 * time.Second
-	pollingBackoffFactor   = 2
-	pollingPath            = "/nfconfig/plmn"
+)
+
+const (
+	pollingBackoffFactor = 2
+	pollingPath          = "/nfconfig/plmn"
 )
 
 type nfConfigPoller struct {

polling/nf_configuration_test.go

@@ -39,6 +39,8 @@ func startPollingServiceForTest(t *testing.T, ch chan<- []models.PlmnId) (contex
 
 func TestStartPollingService_Success(t *testing.T) {
 	originalFetchPlmnConfig := fetchPlmnConfig
+	originalInterval := initialPollingInterval
+	initialPollingInterval = 20 * time.Millisecond
 
 	expectedConfig := []models.PlmnId{{Mcc: "001", Mnc: "01"}}
 	fetchPlmnConfig = func(poller *nfConfigPoller, pollingEndpoint string) ([]models.PlmnId, error) {
@@ -50,6 +52,7 @@ func TestStartPollingService_Success(t *testing.T) {
 		cancel()
 		<-done
 		fetchPlmnConfig = originalFetchPlmnConfig
+		initialPollingInterval = originalInterval
 	}()
 
 	time.Sleep(initialPollingInterval)
@@ -66,6 +69,8 @@ func TestStartPollingService_Success(t *testing.T) {
 
 func TestStartPollingService_RetryAfterFailure(t *testing.T) {
 	originalFetchPlmnConfig := fetchPlmnConfig
+	originalInterval := initialPollingInterval
+	initialPollingInterval = 20 * time.Millisecond
 
 	var callCount atomic.Int32
 	fetchPlmnConfig = func(poller *nfConfigPoller, pollingEndpoint string) ([]models.PlmnId, error) {
@@ -75,16 +80,27 @@ func TestStartPollingService_RetryAfterFailure(t *testing.T) {
 	plmnChan := make(chan []models.PlmnId, 1)
 	cancel, done := startPollingServiceForTest(t, plmnChan)
 	defer func() {
+		cancel()
+		<-done
 		fetchPlmnConfig = originalFetchPlmnConfig
+		initialPollingInterval = originalInterval
 	}()
 
-	time.Sleep(4 * initialPollingInterval)
-	cancel()
-	<-done
-
-	if callCount.Load() < 2 {
-		t.Error("Expected to retry after failure")
+	deadline := time.After(2 * time.Second)
+	ticker := time.NewTicker(time.Millisecond)
+	defer ticker.Stop()
+waitForRetry:
+	for {
+		select {
+		case <-ticker.C:
+			if callCount.Load() >= 2 {
+				break waitForRetry
+			}
+		case <-deadline:
+			t.Fatal("Timed out waiting for retry after failure")
+		}
 	}
+
 	t.Logf("Tried %v times", callCount.Load())
 }