[tests] adapt tests

2 files changed, 5 insertions, 57 deletions

diff --git a/testing/tests/sync/test_encdecpool.py b/testing/tests/sync/test_encdecpool.py
deleted file mode 100644
index 7055a765..00000000
--- a/testing/tests/sync/test_encdecpool.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-import json
-from twisted.internet.defer import inlineCallbacks
-
-from leap.soledad.client.encdecpool import SyncEncrypterPool
-
-from leap.soledad.common.document import SoledadDocument
-from test_soledad.util import BaseSoledadTest
-
-DOC_ID = "mydoc"
-DOC_REV = "rev"
-DOC_CONTENT = {'simple': 'document'}
-
-
-class TestSyncEncrypterPool(BaseSoledadTest):
-
-    def setUp(self):
-        BaseSoledadTest.setUp(self)
-        crypto = self._soledad._crypto
-        sync_db = self._soledad._sync_db
-        self._pool = SyncEncrypterPool(crypto, sync_db)
-        self._pool.start()
-
-    def tearDown(self):
-        self._pool.stop()
-        BaseSoledadTest.tearDown(self)
-
-    @inlineCallbacks
-    def test_get_encrypted_doc_returns_none(self):
-        """
-        Test that trying to get an encrypted doc from the pool returns None if
-        the document was never added for encryption.
-        """
-        doc = yield self._pool.get_encrypted_doc(DOC_ID, DOC_REV)
-        self.assertIsNone(doc)
-
-    @inlineCallbacks
-    def test_encrypt_doc_and_get_it_back(self):
-        """
-        Test that the pool actually encrypts a document added to the queue.
-        """
-        doc = SoledadDocument(
-            doc_id=DOC_ID, rev=DOC_REV, json=json.dumps(DOC_CONTENT))
-
-        yield self._pool.encrypt_doc(doc)
-        encrypted = yield self._pool.get_encrypted_doc(DOC_ID, DOC_REV)
-
-        self.assertIsNotNone(encrypted)
diff --git a/testing/tests/sync/test_sqlcipher_sync.py b/testing/tests/sync/test_sqlcipher_sync.py
index 3cbefc8b..2528600d 100644
--- a/testing/tests/sync/test_sqlcipher_sync.py
+++ b/testing/tests/sync/test_sqlcipher_sync.py
@@ -27,8 +27,6 @@ from leap.soledad.common.l2db import sync
 from leap.soledad.common.l2db import vectorclock
 from leap.soledad.common.l2db import errors
 
-from leap.soledad.common.crypto import ENC_SCHEME_KEY
-from leap.soledad.client.crypto import decrypt_doc_dict
 from leap.soledad.client.http_target import SoledadHTTPSyncTarget
 
 from test_soledad import u1db_tests as tests
@@ -545,13 +543,11 @@ class SQLCipherDatabaseSyncTests(
         self.assertFalse(doc2.has_conflicts)
         self.sync(self.db2, db3)
         doc3 = db3.get_doc('the-doc')
-        if ENC_SCHEME_KEY in doc3.content:
-            _crypto = self._soledad._crypto
-            key = _crypto.doc_passphrase(doc3.doc_id)
-            secret = _crypto.secret
-            doc3.set_json(decrypt_doc_dict(
-                doc3.content,
-                doc3.doc_id, doc3.rev, key, secret))
+
+        _crypto = self._soledad._crypto
+        decrypted = _crypto.decrypt_doc(doc3)
+        doc3.set_json(decrypted)
+
         self.assertEqual(doc4.get_json(), doc3.get_json())
         self.assertFalse(doc3.has_conflicts)
         self.db1.close()