| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 1 | From 1c1812def711803382cc28caea1f35fb7ef774b0 Mon Sep 17 00:00:00 2001 |
| 2 | From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> |
| 3 | Date: Tue, 26 Jan 2016 14:24:26 -0500 |
| 4 | Subject: [PATCH 1/5] reflect 2.1 reporting for key imports |
| 5 | |
| 6 | GnuPG 2.1 changes how it reports key imports. These changes should |
| 7 | make the pygpgme test suite compatible with GnuPG 2.1. |
| 8 | |
| 9 | See also: |
| 10 | https://lists.gnupg.org/pipermail/gnupg-devel/2016-January/030718.html |
| 11 | |
| 12 | Upstream-Status: Backport |
| 13 | |
| 14 | Signed-off-by: Catalin Enache <catalin.enache@windriver.com> |
| 15 | --- |
| 16 | tests/test_import.py | 22 +++++++++++----------- |
| 17 | 1 file changed, 11 insertions(+), 11 deletions(-) |
| 18 | |
| 19 | diff --git a/tests/test_import.py b/tests/test_import.py |
| 20 | index 10eb816..597eb47 100644 |
| 21 | --- a/tests/test_import.py |
| 22 | +++ b/tests/test_import.py |
| 23 | @@ -55,7 +55,7 @@ class ImportTestCase(GpgHomeTestCase): |
| 24 | ctx = gpgme.Context() |
| 25 | with self.keyfile('key1.sec') as fp: |
| 26 | result = ctx.import_(fp) |
| 27 | - self.assertEqual(result.considered, 1) |
| 28 | + self.assertEqual(result.considered, 3) |
| 29 | self.assertEqual(result.no_user_id, 0) |
| 30 | self.assertEqual(result.imported, 1) |
| 31 | self.assertEqual(result.imported_rsa, 0) |
| 32 | @@ -64,18 +64,18 @@ class ImportTestCase(GpgHomeTestCase): |
| 33 | self.assertEqual(result.new_sub_keys, 0) |
| 34 | self.assertEqual(result.new_signatures, 0) |
| 35 | self.assertEqual(result.new_revocations, 0) |
| 36 | - self.assertEqual(result.secret_read, 1) |
| 37 | - self.assertEqual(result.secret_imported, 1) |
| 38 | + self.assertEqual(result.secret_read, 3) |
| 39 | + self.assertEqual(result.secret_imported, 2) |
| 40 | self.assertEqual(result.secret_unchanged, 0) |
| 41 | self.assertEqual(result.skipped_new_keys, 0) |
| 42 | self.assertEqual(result.not_imported, 0) |
| 43 | self.assertEqual(len(result.imports), 2) |
| 44 | self.assertEqual(result.imports[0], |
| 45 | ('E79A842DA34A1CA383F64A1546BB55F0885C65A4', |
| 46 | - None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) |
| 47 | + None, gpgme.IMPORT_NEW)) |
| 48 | self.assertEqual(result.imports[1], |
| 49 | ('E79A842DA34A1CA383F64A1546BB55F0885C65A4', |
| 50 | - None, gpgme.IMPORT_NEW)) |
| 51 | + None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) |
| 52 | # can we get the public key? |
| 53 | key = ctx.get_key('E79A842DA34A1CA383F64A1546BB55F0885C65A4') |
| 54 | # can we get the secret key? |
| 55 | @@ -102,17 +102,17 @@ class ImportTestCase(GpgHomeTestCase): |
| 56 | fp = BytesIO(b'\n'.join(keys)) |
| 57 | ctx = gpgme.Context() |
| 58 | result = ctx.import_(fp) |
| 59 | - self.assertEqual(result.considered, 3) |
| 60 | + self.assertEqual(result.considered, 5) |
| 61 | self.assertEqual(result.no_user_id, 0) |
| 62 | self.assertEqual(result.imported, 2) |
| 63 | - self.assertEqual(result.imported_rsa, 1) |
| 64 | + self.assertEqual(result.imported_rsa, 0) |
| 65 | self.assertEqual(result.unchanged, 0) |
| 66 | self.assertEqual(result.new_user_ids, 0) |
| 67 | self.assertEqual(result.new_sub_keys, 0) |
| 68 | self.assertEqual(result.new_signatures, 1) |
| 69 | self.assertEqual(result.new_revocations, 0) |
| 70 | - self.assertEqual(result.secret_read, 1) |
| 71 | - self.assertEqual(result.secret_imported, 1) |
| 72 | + self.assertEqual(result.secret_read, 3) |
| 73 | + self.assertEqual(result.secret_imported, 2) |
| 74 | self.assertEqual(result.secret_unchanged, 0) |
| 75 | self.assertEqual(result.skipped_new_keys, 0) |
| 76 | self.assertEqual(result.not_imported, 0) |
| 77 | @@ -122,10 +122,10 @@ class ImportTestCase(GpgHomeTestCase): |
| 78 | None, gpgme.IMPORT_NEW)) |
| 79 | self.assertEqual(result.imports[1], |
| 80 | ('E79A842DA34A1CA383F64A1546BB55F0885C65A4', |
| 81 | - None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) |
| 82 | + None, gpgme.IMPORT_SIG)) |
| 83 | self.assertEqual(result.imports[2], |
| 84 | ('E79A842DA34A1CA383F64A1546BB55F0885C65A4', |
| 85 | - None, gpgme.IMPORT_SIG)) |
| 86 | + None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) |
| 87 | self.assertEqual(result.imports[3], |
| 88 | ('93C2240D6B8AA10AB28F701D2CF46B7FC97E6B0F', |