From ebdeec4ad6d0f91bc60fd34a580fc02787026692 Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Wed, 4 Jan 2017 18:11:37 -0200
Subject: [#888] Fix soledad class contract to be compatible with new merge.
 with @thaissiqueira.

---
 service/pixelated/config/sessions.py                | 3 +--
 service/test/support/integration/app_test_client.py | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'service')

diff --git a/service/pixelated/config/sessions.py b/service/pixelated/config/sessions.py
index ec5e1c0e..b3021982 100644
--- a/service/pixelated/config/sessions.py
+++ b/service/pixelated/config/sessions.py
@@ -82,8 +82,7 @@ class LeapSessionFactory(object):
                                                   server_url=server_url,
                                                   cert_file=api_cert,
                                                   shared_db=None,
-                                                  auth_token=user_token,
-                                                  defer_encryption=False)
+                                                  auth_token=user_token)
             defer.returnValue(soledad)
         except (WrongMacError, UnknownMacMethodError), e:
             raise SoledadWrongPassphraseException(e)
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py
index d52c85c0..0ff1df31 100644
--- a/service/test/support/integration/app_test_client.py
+++ b/service/test/support/integration/app_test_client.py
@@ -437,9 +437,7 @@ def initialize_soledad(tempdir, uuid):
         secret_path,
         local_db_path,
         server_url,
-        cert_file,
-        defer_encryption=False,
-        syncable=False)
+        cert_file)
 
     yield SoledadMailAdaptor().initialize_store(_soledad)
 
-- 
cgit v1.2.3