Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

app: use ServerConnectionError from SDK 0.0.13 (resolves failed sync causing AuthError, and KeyError during a failed download) #784

Merged
merged 3 commits into from
Feb 13, 2020

Conversation

redshiftzero
Copy link
Contributor

@redshiftzero redshiftzero commented Feb 7, 2020

Description

⚠️ First merge freedomofpress/securedrop-builder#143 and then rerun the build job below (it will fail until the required dependency is deployed to the pip mirror, which will be upon merge of that PR) ⚠️ (Done)

Checklist

If these changes modify code paths involving cryptography, the opening of files in VMs or network (via the RPC service) traffic, Qubes testing in the staging environment is required. For fine tuning of the graphical user interface, testing in any environment in Qubes is required. Please check as applicable:

  • I have tested these changes in the appropriate Qubes environment
  • I do not have an appropriate Qubes OS workstation set up (the reviewer will need to test these changes)
  • These changes should not need testing in Qubes

If these changes add or remove files other than client code, packaging logic (e.g., the AppArmor profile) may need to be updated. Please check as applicable:

  • I have submitted a separate PR to the packaging repo
  • No update to the packaging logic (e.g., AppArmor profile) is required for these changes
  • I don't know and would appreciate guidance

@eloquence
Copy link
Member

eloquence commented Feb 13, 2020

I'm no longer getting kicked out on sync on this branch, in Qubes. 🎉

these two exceptions should behave the same from the perspective
of the client. At some later point, we may want to customize
behavior (e.g. since the ServerConnectionError will be raised
much faster than a RequestTimeoutError).
@redshiftzero redshiftzero changed the title [wip] app: use ServerConnectionError from SDK 0.0.13 app: use ServerConnectionError from SDK 0.0.13 (resolves failed sync causing AuthError, and KeyError during a failed download) Feb 13, 2020
@redshiftzero redshiftzero marked this pull request as ready for review February 13, 2020 16:38
Copy link
Contributor

@sssoleileraaa sssoleileraaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm and works as described!

@sssoleileraaa sssoleileraaa merged commit 6cb78d4 into master Feb 13, 2020
@sssoleileraaa sssoleileraaa deleted the use-sdk-serverconnectionerror branch February 13, 2020 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants