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

Fixes #4038 python-gnupg works with gpg binary #4040

Closed
wants to merge 1 commit into from

Conversation

kushaldas
Copy link
Contributor

@kushaldas kushaldas commented Jan 17, 2019

Status

DO NOT MERGE

Description of Changes

Fixes #4038

For the python-gnupg to work properly on Xenial, we should
call gpg binary instead of gpg2 (which we use in Trusty).

Testing

To view the effected 2fa tests: $ BASE_OS=xenial securedrop/bin/dev-shell bin/run-test -v tests/test_2fa.py

make test-xenial

Deployment

We will have to verify in the upgrade story.

Checklist

If you made changes to the server application code:

  • Linting (make ci-lint) and tests (make -C securedrop test) pass in the development container

If you made changes to securedrop-admin:

  • Linting and tests (make -C admin test) pass in the admin development container

If you made changes to the system configuration:

If you made non-trivial code changes:

  • I have written a test plan and validated it for this PR

If you made changes to documentation:

  • Doc linting (make docs-lint) passed locally

For the python-gnupg to work properly on Xenial, we should
call `gpg` binary instead of `gpg2` (which we use in Trusty).
@redshiftzero
Copy link
Contributor

Nice!

So the test plan here should indicate that the integration tests should pass (not the 2fa tests), right? Does this also resolve #4013?

@kushaldas
Copy link
Contributor Author

So the test plan here should indicate that the integration tests should pass (not the 2fa tests), right? Does this also resolve #4013?

It should, but, it seems I will need both is one and also #4041 in the same PR to make things working. Let me try another local branch first and then will create a new PR.

@redshiftzero
Copy link
Contributor

good news! check out #4045. gonna close this one

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants