Merge pull request #4045 from freedomofpress/gpg-import-ok

[xenial] resolve gpg IMPORT_OK status code test failures
freedomofpress · Jan 18, 2019 · 54c7910 · 54c7910
2 parents e279856 + 09a63fc
commit 54c7910
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/securedrop/tests/conftest.py b/securedrop/tests/conftest.py
@@ -77,7 +77,7 @@ def config(tmpdir):
     tmp = data.mkdir('tmp')
     sqlite = data.join('db.sqlite')
 
-    gpg = gnupg.GPG(homedir=str(keys))
+    gpg = gnupg.GPG('gpg2', homedir=str(keys))
     for ext in ['sec', 'pub']:
         with io.open(path.join(path.dirname(__file__),
                                'files',

diff --git a/securedrop/tests/test_integration.py b/securedrop/tests/test_integration.py
@@ -411,7 +411,7 @@ def _can_decrypt_with_key(journalist_app, msg, key_fpr, passphrase=None):
     # to use it to test whether a message is decryptable with a specific
     # key.
     gpg_tmp_dir = tempfile.mkdtemp()
-    gpg = gnupg.GPG(homedir=gpg_tmp_dir)
+    gpg = gnupg.GPG('gpg2', homedir=gpg_tmp_dir)
 
     # Export the key of interest from the application's keyring
     pubkey = journalist_app.crypto_util.gpg.export_keys(key_fpr)

diff --git a/securedrop/tests/utils/env.py b/securedrop/tests/utils/env.py
@@ -37,7 +37,7 @@ def init_gpg():
     """Initialize the GPG keyring and import the journalist key for
     testing.
     """
-    gpg = gnupg.GPG(homedir=config.GPG_KEY_DIR)
+    gpg = gnupg.GPG('gpg2', homedir=config.GPG_KEY_DIR)
     # Faster to import a pre-generated key than to gen a new one every time.
     for keyfile in (join(FILES_DIR, "test_journalist_key.pub"),
                     join(FILES_DIR, "test_journalist_key.sec")):