yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: Fix race condition in bridge mock updater

Browse Source 
We need to protect the latest version info by a lock.
This commit is contained in:
James Houlahan
2022-10-24 16:48:49 +02:00
parent 350544e801
commit 7df2d70dbf
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/bridge/mocks.go
View File

@ -4,6 +4,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
"sync"
"testing" "testing"
"github.com/Masterminds/semver/v3" "github.com/Masterminds/semver/v3"
@ -92,6 +93,7 @@ func (provider *TestLocationsProvider) UserCache() string {
type TestUpdater struct { type TestUpdater struct {
latest updater.VersionInfo latest updater.VersionInfo
lock sync.RWMutex
} }
func NewTestUpdater(version, minAuto *semver.Version) *TestUpdater { func NewTestUpdater(version, minAuto *semver.Version) *TestUpdater {
@ -106,6 +108,9 @@ func NewTestUpdater(version, minAuto *semver.Version) *TestUpdater {
} }
func (testUpdater *TestUpdater) SetLatestVersion(version, minAuto *semver.Version) { func (testUpdater *TestUpdater) SetLatestVersion(version, minAuto *semver.Version) {
testUpdater.lock.Lock()
defer testUpdater.lock.Unlock()
testUpdater.latest = updater.VersionInfo{ testUpdater.latest = updater.VersionInfo{
Version: version, Version: version,
MinAuto: minAuto, MinAuto: minAuto,
@ -115,6 +120,9 @@ func (testUpdater *TestUpdater) SetLatestVersion(version, minAuto *semver.Versio
} }
func (testUpdater *TestUpdater) GetVersionInfo(downloader updater.Downloader, channel updater.Channel) (updater.VersionInfo, error) { func (testUpdater *TestUpdater) GetVersionInfo(downloader updater.Downloader, channel updater.Channel) (updater.VersionInfo, error) {
testUpdater.lock.RLock()
defer testUpdater.lock.RUnlock()
return testUpdater.latest, nil return testUpdater.latest, nil
} }