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

Fix deadlock in integration tests for Import-Export

Browse Source
This commit is contained in:
Michal Horejsek
2020-10-16 10:53:44 +02:00
parent 932928ddc8
commit 4893931a8d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -6,6 +6,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
### Fixed ### Fixed
* GODT-749 Don't force PGP/Inline when sending plaintext messages. * GODT-749 Don't force PGP/Inline when sending plaintext messages.
* GODT-764 Fix deadlock in integration tests for Import-Export.
### Changed ### Changed
* Bump crypto version to v0.0.0-20200818122824-ed5d25e28db8 * Bump crypto version to v0.0.0-20200818122824-ed5d25e28db8

5
test/transfer_checks_test.go
View File

@ -48,7 +48,10 @@ func TransferChecksFeatureContext(s *godog.Suite) {
func progressFinishedWith(wantResponse string) error { func progressFinishedWith(wantResponse string) error {
progress := ctx.GetTransferProgress() progress := ctx.GetTransferProgress()
// Wait till transport is finished. // Wait till transport is finished.
for range progress.GetUpdateChannel() { updateCh := progress.GetUpdateChannel()
if updateCh != nil {
for range updateCh {
}
} }
err := progress.GetFatalError() err := progress.GetFatalError()