diff options
| author | drebs <drebs@leap.se> | 2016-05-07 17:51:55 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2016-05-07 17:56:04 -0300 |
| commit | 7efa05d1b09b91c323815e85cae7e6d523259267 (patch) | |
| tree | bca5dcabd6463329d78126edac2d22cf9009938b /common/src/leap | |
| parent | 73af9d386e08124d5cec0af2ec259d9cd5ec67a5 (diff) | |
[refactor] change secrets import/export meth names to load/dumpbug/remove-unicode-conversion
Diffstat (limited to 'common/src/leap')
| -rw-r--r-- | common/src/leap/soledad/common/tests/test_crypto.py | 10 | ||||
| -rw-r--r-- | common/src/leap/soledad/common/tests/test_soledad.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/common/src/leap/soledad/common/tests/test_crypto.py b/common/src/leap/soledad/common/tests/test_crypto.py index 5ced024b..08185a80 100644 --- a/common/src/leap/soledad/common/tests/test_crypto.py +++ b/common/src/leap/soledad/common/tests/test_crypto.py @@ -62,8 +62,8 @@ class EncryptedSyncTestCase(BaseSoledadTest): class RecoveryDocumentTestCase(BaseSoledadTest): - def test_export_recovery_document_raw(self): - rd = self._soledad.secrets._export_recovery_document() + def test_dump_recovery_document_raw(self): + rd = self._soledad.secrets._dump_recovery_document() secret_id = rd[self._soledad.secrets.STORAGE_SECRETS_KEY].items()[0][0] # assert exported secret is the same secret = self._soledad.secrets._decrypt_storage_secret_version_1( @@ -79,10 +79,10 @@ class RecoveryDocumentTestCase(BaseSoledadTest): self.assertTrue(self._soledad.secrets.LENGTH_KEY in encrypted_secret) self.assertTrue(self._soledad.secrets.SECRET_KEY in encrypted_secret) - def test_import_recovery_document(self): - rd = self._soledad.secrets._export_recovery_document() + def test_load_recovery_document(self): + rd = self._soledad.secrets._dump_recovery_document() s = self._soledad_instance() - s.secrets._import_recovery_document(rd) + s.secrets._load_recovery_document(rd) s.secrets.set_secret_id(self._soledad.secrets._secret_id) self.assertEqual(self._soledad.storage_secret, s.storage_secret, diff --git a/common/src/leap/soledad/common/tests/test_soledad.py b/common/src/leap/soledad/common/tests/test_soledad.py index ba1113bc..f3b82ab7 100644 --- a/common/src/leap/soledad/common/tests/test_soledad.py +++ b/common/src/leap/soledad/common/tests/test_soledad.py @@ -294,7 +294,7 @@ class SoledadSignalingTestCase(BaseSoledadTest): sol = self._soledad_instance() # create a document with secrets doc = SoledadDocument(doc_id=sol.secrets._shared_db_doc_id()) - doc.content = sol.secrets._export_recovery_document() + doc.content = sol.secrets._dump_recovery_document() sol.close() # reset mock soledad.client.secrets.events.emit_async.reset_mock() |