[test] fix test and remove leftovers defer_encryption

4 files changed, 5 insertions, 16 deletions

diff --git a/testing/test_soledad/util.py b/testing/test_soledad/util.py
index b1965aa6..f44ce166 100644
--- a/testing/test_soledad/util.py
+++ b/testing/test_soledad/util.py
@@ -216,7 +216,6 @@ class BaseSoledadTest(BaseLeapTest, MockedSharedDBTest):
     """
     Instantiates Soledad for usage in tests.
     """
-    defer_sync_encryption = False
 
     @pytest.mark.usefixtures("method_tmpdir")
     def setUp(self):
@@ -300,7 +299,6 @@ class BaseSoledadTest(BaseLeapTest, MockedSharedDBTest):
                 self.tempdir, prefix, local_db_path),
             server_url=server_url,  # Soledad will fail if not given an url
             cert_file=cert_file,
-            defer_encryption=self.defer_sync_encryption,
             shared_db=MockSharedDB(),
             auth_token=auth_token)
         self.addCleanup(soledad.close)
diff --git a/testing/tests/server/test_server.py b/testing/tests/server/test_server.py
index 6bbcf002..a7cc97d4 100644
--- a/testing/tests/server/test_server.py
+++ b/testing/tests/server/test_server.py
@@ -41,7 +41,7 @@ from test_soledad.util import (
     BaseSoledadTest,
 )
 
-from leap.soledad.common import crypto
+from leap.soledad.client import _crypto
 from leap.soledad.client import Soledad
 from leap.soledad.server.config import load_configuration
 from leap.soledad.server.config import CONFIG_DEFAULTS
@@ -412,13 +412,8 @@ class EncryptedSyncTestCase(
                 self.assertEqual(soldoc.doc_id, couchdoc.doc_id)
                 self.assertEqual(soldoc.rev, couchdoc.rev)
                 couch_content = couchdoc.content.keys()
-                self.assertEqual(6, len(couch_content))
-                self.assertTrue(crypto.ENC_JSON_KEY in couch_content)
-                self.assertTrue(crypto.ENC_SCHEME_KEY in couch_content)
-                self.assertTrue(crypto.ENC_METHOD_KEY in couch_content)
-                self.assertTrue(crypto.ENC_IV_KEY in couch_content)
-                self.assertTrue(crypto.MAC_KEY in couch_content)
-                self.assertTrue(crypto.MAC_METHOD_KEY in couch_content)
+                self.assertEqual(['raw'], couch_content)
+                self.assertTrue(_crypto.is_symmetrically_encrypted(couchdoc.get_json()))
 
         d = sol1.get_all_docs()
         d.addCallback(_db1AssertEmptyDocList)
diff --git a/testing/tests/sync/test_sqlcipher_sync.py b/testing/tests/sync/test_sqlcipher_sync.py
index c3cd8444..029164eb 100644
--- a/testing/tests/sync/test_sqlcipher_sync.py
+++ b/testing/tests/sync/test_sqlcipher_sync.py
@@ -544,10 +544,6 @@ class SQLCipherDatabaseSyncTests(
         self.sync(self.db2, db3)
         doc3 = db3.get_doc('the-doc')
 
-        _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()
diff --git a/testing/tests/sync/test_sync_target.py b/testing/tests/sync/test_sync_target.py
index 7c93cd7c..ef034142 100644
--- a/testing/tests/sync/test_sync_target.py
+++ b/testing/tests/sync/test_sync_target.py
@@ -71,7 +71,7 @@ class TestSoledadParseReceivedDocResponse(unittest.TestCase):
         doc = SoledadDocument('i', rev='r')
         doc.content = {'a': 'b'}
 
-        encrypted_docstr = _crypto.SoledadCrypto('').encrypt_doc(doc)
+        encrypted_docstr = _crypto.SoledadCrypto('safe').encrypt_doc(doc)
 
         with self.assertRaises(l2db.errors.BrokenSyncStream):
             self.parse("[\r\n{},\r\n]")
@@ -589,9 +589,9 @@ class SoledadDatabaseSyncTargetTests(
             [], 'other-replica', last_known_generation=0,
             last_known_trans_id=None, insert_doc_cb=self.receive_doc)
         self.assertTransactionLog([doc.doc_id, doc.doc_id], self.db)
+        self.assertEqual(2, new_gen)
         self.assertEqual(
             (doc.doc_id, doc.rev, None, 2), self.other_changes[0][:-1])
-        self.assertEqual(2, new_gen)
         if self.whitebox:
             self.assertEqual(self.db._last_exchange_log['return'],
                              {'last_gen': 2, 'docs': [(doc.doc_id, doc.rev)]})