diff options
author | Bruno Wagner Gonçalves <bwagner@riseup.net> | 2015-05-04 14:22:33 -0300 |
---|---|---|
committer | Bruno Wagner Gonçalves <bwagner@riseup.net> | 2015-05-04 14:22:33 -0300 |
commit | a28d2b333261d788c44d1835dda4d86427ab7728 (patch) | |
tree | e4cdd206d838b9ea9dbb684676f3254a00bc4c39 /service/test/unit/bitmask_libraries/test_soledad.py | |
parent | 4fe2aebde4a8bafcb2937bed4c9861f67230cb9b (diff) | |
parent | 30fe9e6c31ed8d5d0ee76c13e3344e67e26f1479 (diff) |
Merge pull request #389 from pixelated-project/srp_changes
SRP changes to support LEAP 0.7
Diffstat (limited to 'service/test/unit/bitmask_libraries/test_soledad.py')
-rw-r--r-- | service/test/unit/bitmask_libraries/test_soledad.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/service/test/unit/bitmask_libraries/test_soledad.py b/service/test/unit/bitmask_libraries/test_soledad.py index a71275e0..a3a1094a 100644 --- a/service/test/unit/bitmask_libraries/test_soledad.py +++ b/service/test/unit/bitmask_libraries/test_soledad.py @@ -34,19 +34,19 @@ class SoledadSessionTest(AbstractLeapTest): @patch('pixelated.bitmask_libraries.soledad.Soledad.__init__') def test_that_soledad_is_created_with_required_params(self, soledad_mock, init_mock): # when - SoledadSession(self.provider, 'any-passphrase', self.srp_session) + SoledadSession(self.provider, 'any-passphrase', self.auth.token, self.auth.uuid) # then - init_mock.assert_called_with(self.uuid, 'any-passphrase', '%s/soledad/%s.secret' % (self.leap_home, self.uuid), - '%s/soledad/%s.db' % (self.leap_home, self.uuid), - 'https://couch1.some-server.test:1234/user-%s' % self.uuid, + init_mock.assert_called_with(self.auth.uuid, 'any-passphrase', '%s/soledad/%s.secret' % (self.leap_home, self.auth.uuid), + '%s/soledad/%s.db' % (self.leap_home, self.auth.uuid), + 'https://couch1.some-server.test:1234/user-%s' % self.auth.uuid, '/some/path/to/ca_cert', self.token, defer_encryption=False) def test_that_sync_is_called(self, soledad_mock): instance = soledad_mock.return_value instance.server_url = '/foo/bar' instance.need_sync.return_value = True - soledad_session = SoledadSession(self.provider, 'any-passphrase', self.srp_session) + soledad_session = SoledadSession(self.provider, 'any-passphrase', self.auth.token, self.auth.uuid) # when soledad_session.sync() @@ -59,7 +59,7 @@ class SoledadSessionTest(AbstractLeapTest): instance = mock.return_value instance.server_url = '/foo/bar' instance.need_sync.return_value = False - soledad_session = SoledadSession(self.provider, 'any-passphrase', self.srp_session) + soledad_session = SoledadSession(self.provider, 'any-passphrase', self.auth.token, self.auth.uuid) # when soledad_session.sync() |