diff --git a/admin/securedrop_admin/__init__.py b/admin/securedrop_admin/__init__.py index 15f62710f3..bf7613b296 100755 --- a/admin/securedrop_admin/__init__.py +++ b/admin/securedrop_admin/__init__.py @@ -948,7 +948,9 @@ def update(args: argparse.Namespace) -> int: good_sig_text = ['Good signature from "SecureDrop Release Signing ' + 'Key"', 'Good signature from "SecureDrop Release Signing ' + - 'Key "'] + 'Key "', + 'Good signature from "SecureDrop Release Signing ' + + 'Key "'] bad_sig_text = 'BAD signature' gpg_lines = sig_result.split('\n') diff --git a/admin/tests/test_securedrop-admin.py b/admin/tests/test_securedrop-admin.py index 33230dbde1..585e2e7cbd 100644 --- a/admin/tests/test_securedrop-admin.py +++ b/admin/tests/test_securedrop-admin.py @@ -274,6 +274,25 @@ def test_get_release_key_from_valid_keyserver(self, tmpdir, caplog): b'Signing Key ' b'"\n', + b'gpg: Signature made Thu 20 Jul ' + b'2017 08:12:25 PM EDT\n' + b'gpg: using RSA key ' + b'2359E6538C0613E652955E6C188EDD3B7B22E6A3\n' + b'gpg: Good signature from "SecureDrop Release ' + b'Signing Key ' + b'"\n', + + b'gpg: Signature made Thu 20 Jul ' + b'2017 08:12:25 PM EDT\n' + b'gpg: using RSA key ' + b'2359E6538C0613E652955E6C188EDD3B7B22E6A3\n' + b'gpg: Good signature from "SecureDrop Release ' + b'Signing Key" [unknown]\n' + b'gpg: aka "SecureDrop Release ' + b'Signing Key ' + b'" ' + b'[unknown]\n', + b'gpg: Signature made Thu 20 Jul ' b'2017 08:12:25 PM EDT\n' b'gpg: using RSA key '