[feat] improve duplicated active documents fixup

Mostly for private keys we want to keep the latest one in the keyring.
It would be desirable to check with one is set in nicknym, but this
will need a big refactor that I'm not sure if it's worth it just for
that.

- Related: #6658, #8059

1 files changed, 26 insertions, 41 deletions

diff --git a/src/leap/keymanager/tests/test_openpgp.py b/src/leap/keymanager/tests/test_openpgp.py
index 4c01676..17a6b79 100644
--- a/src/leap/keymanager/tests/test_openpgp.py
+++ b/src/leap/keymanager/tests/test_openpgp.py
@@ -309,52 +309,37 @@ class OpenPGPCryptoTestCase(KeyManagerWithSoledadTestCase):
         self.assertEqual(self.count, 2)
 
     @inlineCallbacks
-    def test_self_repair_five_active_docs(self):
+    def test_self_repair_six_active_docs(self):
         pgp = openpgp.OpenPGPScheme(
             self._soledad, gpgbinary=self.gpg_binary_path)
 
-        get_from_index = self._soledad.get_from_index
-        delete_doc = self._soledad.delete_doc
-
-        def my_get_from_index(*args):
-            if (args[0] == TYPE_ADDRESS_PRIVATE_INDEX and
-                    args[2] == ADDRESS):
-                k1 = OpenPGPKey(ADDRESS, fingerprint="1",
-                                last_audited_at=datetime(2005, 1, 1))
-                k2 = OpenPGPKey(ADDRESS, fingerprint="2",
-                                last_audited_at=datetime(2007, 1, 1))
-                k3 = OpenPGPKey(ADDRESS, fingerprint="3",
-                                last_audited_at=datetime(2007, 1, 1),
-                                encr_used=True, sign_used=True)
-                k4 = OpenPGPKey(ADDRESS, fingerprint="4",
-                                last_audited_at=datetime(2007, 1, 1),
-                                sign_used=True)
-                k5 = OpenPGPKey(ADDRESS, fingerprint="5",
-                                last_audited_at=datetime(2007, 1, 1),
-                                encr_used=True)
-                deferreds = []
-                for k in (k1, k2, k3, k4, k5):
-                    d = self._soledad.create_doc_from_json(
-                        k.get_active_json())
-                    deferreds.append(d)
-                return gatherResults(deferreds)
-            elif args[0] == TYPE_FINGERPRINT_PRIVATE_INDEX:
-                fingerprint = args[2]
-                self.assertEqual(fingerprint, "3")
-                k = OpenPGPKey(ADDRESS, fingerprint="3")
-                return succeed(
-                    [self._soledad.create_doc_from_json(k.get_json())])
-            return get_from_index(*args)
+        k1 = OpenPGPKey(ADDRESS, fingerprint="1",
+                        refreshed_at=datetime(2005, 1, 1))
+        k2 = OpenPGPKey(ADDRESS, fingerprint="2",
+                        refreshed_at=datetime(2007, 1, 1))
+        k3 = OpenPGPKey(ADDRESS, fingerprint="3",
+                        refreshed_at=datetime(2007, 1, 1),
+                        encr_used=True, sign_used=True)
+        k4 = OpenPGPKey(ADDRESS, fingerprint="4",
+                        refreshed_at=datetime(2007, 1, 1),
+                        sign_used=True)
+        k5 = OpenPGPKey(ADDRESS, fingerprint="5",
+                        refreshed_at=datetime(2007, 1, 1),
+                        encr_used=True)
+        k6 = OpenPGPKey(ADDRESS, fingerprint="6",
+                        refreshed_at=datetime(2006, 1, 1),
+                        encr_used=True, sign_used=True)
+        keys = (k1, k2, k3, k4, k5, k6)
+        for key in keys:
+            yield self._soledad.create_doc_from_json(key.get_json())
+            yield self._soledad.create_doc_from_json(key.get_active_json())
 
-        self._soledad.get_from_index = my_get_from_index
-        self._soledad.delete_doc = Mock(return_value=succeed(None))
+        delete_doc = self._mock_delete_doc()
 
-        try:
-            yield pgp.get_key(ADDRESS, private=False)
-            self.assertEqual(self._soledad.delete_doc.call_count, 4)
-        finally:
-            self._soledad.get_from_index = get_from_index
-            self._soledad.delete_doc = delete_doc
+        key = yield pgp.get_key(ADDRESS, private=False)
+        self._soledad.delete_doc = delete_doc
+        self.assertEqual(self.count, 5)
+        self.assertEqual(key.fingerprint, "3")
 
     def _assert_key_not_found(self, pgp, address, private=False):
         d = pgp.get_key(address, private=private)