Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-10 04:36:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Other: Get test events before starting bridge to ensure all are captured

Browse Source
This commit is contained in:
James Houlahan
2022-10-13 02:33:20 +02:00
parent ef2dea89b4
commit a4852c1b36
3 changed files with 76 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/bridge_test.go
View File

@ -8,6 +8,7 @@ import (
"time"
"github.com/Masterminds/semver/v3"
"github.com/ProtonMail/gluon/queue"
"github.com/ProtonMail/proton-bridge/v2/internal/events"
"github.com/ProtonMail/proton-bridge/v2/internal/vault"
)
@ -249,9 +250,9 @@ func (s *scenario) bridgeSendsAForcedUpdateEvent() error {
})
}
func try[T any](inCh <-chan T, wait time.Duration, fn func(T) error) error {
func try[T any](inCh *queue.QueuedChannel[T], wait time.Duration, fn func(T) error) error {
select {
case event := <-inCh:
case event := <-inCh.GetChannel():
return fn(event)
case <-time.After(wait):
@ -259,6 +260,6 @@ func try[T any](inCh <-chan T, wait time.Duration, fn func(T) error) error {
}
}
func get[T any](inCh <-chan T, fn func(T) error) error {
return fn(<-inCh)
func get[T any](inCh *queue.QueuedChannel[T], fn func(T) error) error {
return fn(<-inCh.GetChannel())
}