diff options
| author | Tayane Fernandes <tayane.rmf@gmail.com> | 2017-02-15 18:06:11 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 18:06:11 -0200 |
| commit | 48a1ca5f8310ef6fb61dc821c38d435617b19d5c (patch) | |
| tree | 8743f417e45166d6780be1dc7ffee8d4f20bb29e /service | |
| parent | 2c9cc5ac00865e9d80bf0dc07dd8e84df0fbae5e (diff) | |
| parent | 49fd4083b742fb13f7c759c4edee3f8fb2818097 (diff) | |
Merge pull request #985 from pixelated/soledad-merge
Changes to keep the compatibility with new soledad changes
Diffstat (limited to 'service')
| -rw-r--r-- | service/pixelated/config/sessions.py | 3 | ||||
| -rw-r--r-- | service/requirements.txt | 4 | ||||
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 4 |
3 files changed, 4 insertions, 7 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/requirements.txt b/service/requirements.txt index ad990332..dace91b2 100644 --- a/service/requirements.txt +++ b/service/requirements.txt @@ -8,6 +8,6 @@ whoosh==2.6.0 Twisted==16.1.1 -e 'git+https://0xacab.org/pixelated/leap_pycommon.git@develop#egg=leap.common' -e 'git+https://0xacab.org/pixelated/bitmask-dev.git@feat_fetch_remote_on_expiry#egg=leap.bitmask' --e 'git+https://0xacab.org/pixelated/soledad.git@develop#egg=leap.soledad.common&subdirectory=common/' --e 'git+https://0xacab.org/pixelated/soledad.git@develop#egg=leap.soledad.client&subdirectory=client/' +-e 'git+https://0xacab.org/pixelated/soledad.git@master#egg=leap.soledad.common&subdirectory=common/' +-e 'git+https://0xacab.org/pixelated/soledad.git@master#egg=leap.soledad.client&subdirectory=client/' -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) |