From 9c6e2a7f40f3e96b203e1528ab974286e27a8d32 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 18 Jan 2017 14:14:15 -0200 Subject: Revert "Revert "[#888] Fix soledad class contract to be compatible with new merge. with @thaissiqueira."" This reverts commit 1e6e165a3fc397e45884eaec1122ba0cc5ff923e. --- service/test/support/integration/app_test_client.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'service/test/support/integration/app_test_client.py') 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 From b67abc5e64206672840320a5e2c89fda5d484c78 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Wed, 1 Mar 2017 15:06:43 -0300 Subject: Fix soledad shared_db argument when testing --- service/test/support/integration/app_test_client.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'service/test/support/integration/app_test_client.py') diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index 0ff1df31..538cf633 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -429,15 +429,15 @@ def initialize_soledad(tempdir, uuid): def __call__(self): return self - Soledad._shared_db = MockSharedDB() - _soledad = Soledad( uuid, passphrase, secret_path, local_db_path, server_url, - cert_file) + cert_file, + shared_db=MockSharedDB() + ) yield SoledadMailAdaptor().initialize_store(_soledad) -- cgit v1.2.3