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

fix(GODT-2802): Remove CPC request from Event Service

Browse Source 
Prevents deadlocks if the service needs to be paused during an event
loop.
This commit is contained in:
Leander Beernaert
2023-07-26 09:59:22 +02:00
parent da528f2d9b
commit 334a256638
4 changed files with 42 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/services/userevents/service_test.go
View File

@ -67,7 +67,7 @@ func TestService_EventIDLoadStore(t *testing.T) {
service := NewService("foo", eventSource, eventIDStore, eventPublisher, 1*time.Millisecond, time.Second, async.NoopPanicHandler{})
require.NoError(t, service.Start(context.Background(), group))
require.NoError(t, service.Resume(context.Background()))
service.Resume()
group.WaitToFinish()
}
@ -113,7 +113,7 @@ func TestService_RetryEventOnNonCatastrophicFailure(t *testing.T) {
service.Subscribe(Subscription{Messages: subscriber})
require.NoError(t, service.Start(context.Background(), group))
require.NoError(t, service.Resume(context.Background()))
service.Resume()
group.WaitToFinish()
}
@ -160,16 +160,14 @@ func TestService_OnBadEventServiceIsPaused(t *testing.T) {
}).Do(func(_ context.Context, event events.Event) {
group.Once(func(_ context.Context) {
// Use background context to avoid having the request cancelled
paused, err := service.IsPaused(context.Background())
require.NoError(t, err)
require.True(t, paused)
require.True(t, service.IsPaused())
group.Cancel()
})
})
service.Subscribe(Subscription{Messages: subscriber})
require.NoError(t, service.Start(context.Background(), group))
require.NoError(t, service.Resume(context.Background()))
service.Resume()
group.WaitToFinish()
}
@ -216,7 +214,7 @@ func TestService_UnsubscribeDuringEventHandlingDoesNotCauseDeadlock(t *testing.T
service.Subscribe(Subscription{Messages: subscriber})
require.NoError(t, service.Start(context.Background(), group))
require.NoError(t, service.Resume(context.Background()))
service.Resume()
group.WaitToFinish()
}
@ -264,6 +262,6 @@ func TestService_UnsubscribeBeforeHandlingEventIsNotConsideredError(t *testing.T
service.Subscribe(Subscription{Messages: subscriber})
require.NoError(t, service.Start(context.Background(), group))
require.NoError(t, service.Resume(context.Background()))
service.Resume()
group.WaitToFinish()
}