diff options
| author | drebs <drebs@leap.se> | 2017-03-11 14:38:51 +0100 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2017-03-11 14:38:51 +0100 |
| commit | 3ec21a7a6b39b4fe8885f3050ab75402e6812a1f (patch) | |
| tree | 300a2d8da67bbc7c6484f9ee136a4a18c41c48c6 /testing/tests/sync | |
| parent | c379a58d84fbf061b8d046057e45089f0e3c65f6 (diff) | |
| parent | 3eefcb7d138ef41932a748ae729bfa0b629758d2 (diff) | |
Merge tag '0.9.3' into debian/platform-0.9
0.9.3
Conflicts:
server/pkg/soledad-server
server/pkg/soledad-server.service
Diffstat (limited to 'testing/tests/sync')
| -rw-r--r-- | testing/tests/sync/test_sync_target.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/testing/tests/sync/test_sync_target.py b/testing/tests/sync/test_sync_target.py index 6ce9a5c5..25136ba1 100644 --- a/testing/tests/sync/test_sync_target.py +++ b/testing/tests/sync/test_sync_target.py @@ -63,7 +63,8 @@ class TestSoledadParseReceivedDocResponse(unittest.TestCase): """ def parse(self, stream): - parser = DocStreamReceiver(None, None, lambda *_: defer.succeed(42)) + parser = DocStreamReceiver(None, defer.Deferred(), + lambda *_: defer.succeed(42)) parser.dataReceived(stream) parser.finish() @@ -838,7 +839,7 @@ class TestSoledadDbSync( # already created on some setUp method. import binascii tohex = binascii.b2a_hex - key = tohex(self._soledad.secrets.get_local_storage_key()) + key = tohex(self._soledad.secrets.local_key) dbpath = self._soledad._local_db_path self.opts = SQLCipherOptions( |