diff options
| author | Anike Arni <aarni@thoughtworks.com> | 2017-01-18 14:14:15 -0200 |
|---|---|---|
| committer | Thais Siqueira <thais.siqueira@gmail.com> | 2017-02-14 16:04:19 -0200 |
| commit | 9c6e2a7f40f3e96b203e1528ab974286e27a8d32 (patch) | |
| tree | ba56d878dbab52b791081a062831517f88ca27e3 | |
| parent | d80b44f079b5fd3d9bf51962542516b9f6340f3a (diff) | |
Revert "Revert "[#888] Fix soledad class contract to be compatible with new merge. with @thaissiqueira.""
This reverts commit 1e6e165a3fc397e45884eaec1122ba0cc5ff923e.
| -rw-r--r-- | service/pixelated/config/sessions.py | 3 | ||||
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/service/pixelated/config/sessions.py b/service/pixelated/config/sessions.py index eb233a9f..594b8e35 100644 --- a/service/pixelated/config/sessions.py +++ b/service/pixelated/config/sessions.py @@ -95,8 +95,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) |