Fix tests

Author: pappz

client/internal/updatemanager/manager.go

@@ -57,6 +57,8 @@ type Manager struct {
 
 	// updateMutex protect update and expectedVersion fields
 	updateMutex sync.Mutex
+
+	triggerUpdateFn func(string) error
 }
 
 func NewManager(statusRecorder *peer.Status, stateManager *statemanager.Manager) *Manager {
@@ -68,6 +70,7 @@ func NewManager(statusRecorder *peer.Status, stateManager *statemanager.Manager)
 		currentVersion: version.NetbirdVersion(),
 		update:         version.NewUpdate("nb/client"),
 	}
+	manager.triggerUpdateFn = manager.triggerUpdate
 
 	return manager
 }
@@ -246,7 +249,7 @@ func (m *Manager) handleUpdate(ctx context.Context) {
 		}
 	}
 
-	if err := m.triggerUpdate(updateVersion.String()); err != nil {
+	if err := m.triggerUpdateFn(updateVersion.String()); err != nil {
 		log.Errorf("Error triggering auto-update: %v", err)
 		m.statusRecorder.PublishEvent(
 			cProto.SystemEvent_ERROR,

client/internal/updatemanager/manager_test.go

@@ -3,12 +3,14 @@ package updatemanager
 import (
 	"context"
 	"fmt"
-	v "github.com/hashicorp/go-version"
-	"github.com/netbirdio/netbird/client/internal/peer"
-	"github.com/netbirdio/netbird/client/internal/statemanager"
 	"path"
 	"testing"
 	"time"
+
+	v "github.com/hashicorp/go-version"
+
+	"github.com/netbirdio/netbird/client/internal/peer"
+	"github.com/netbirdio/netbird/client/internal/statemanager"
 )
 
 func (m *Manager) WithCustomVersionUpdate(versionUpdate UpdateInterface) *Manager {
@@ -71,7 +73,7 @@ func Test_LatestVersion(t *testing.T) {
 
 		targetVersionChan := make(chan string, 1)
 
-		m.updateFunc = func(ctx context.Context, targetVersion string) error {
+		m.triggerUpdateFn = func(targetVersion string) error {
 			targetVersionChan <- targetVersion
 			return nil
 		}
@@ -183,7 +185,7 @@ func Test_HandleUpdate(t *testing.T) {
 		m := NewManager(peer.NewRecorder(""), statemanager.New(tmpFile)).WithCustomVersionUpdate(&versionUpdateMock{latestVersion: c.latestVersion})
 		targetVersionChan := make(chan string, 1)
 
-		m.updateFunc = func(ctx context.Context, targetVersion string) error {
+		m.triggerUpdateFn = func(targetVersion string) error {
 			targetVersionChan <- targetVersion
 			return nil
 		}

client/server/server_test.go

@@ -108,7 +108,7 @@ func TestConnectWithRetryRuns(t *testing.T) {
 	t.Setenv(maxRetryTimeVar, "5s")
 	t.Setenv(retryMultiplierVar, "1")
 
-	s.connectWithRetryRuns(ctx, config, s.statusRecorder, nil, nil)
+	s.connectWithRetryRuns(ctx, config, s.statusRecorder, false, nil, nil)
 	if counter < 3 {
 		t.Fatalf("expected counter > 2, got %d", counter)
 	}