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