diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-12-06 15:43:23 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-12-06 15:43:23 -0300 |
| commit | deb78a5f3502ece98ec3e0b70f93025c4a1b3da5 (patch) | |
| tree | abb188c846482e60a1961864b70c17cbf760f6a8 /common/src/leap/soledad/common/tests/test_soledad.py | |
| parent | 0ade4a7e3a323df631c9772e4db5173a20979d46 (diff) | |
| parent | 5f2a29120ba2d22d7d2406628ce2f6735b60d09c (diff) | |
Merge branch 'release-0.4.4'0.4.4
Diffstat (limited to 'common/src/leap/soledad/common/tests/test_soledad.py')
| -rw-r--r-- | common/src/leap/soledad/common/tests/test_soledad.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/src/leap/soledad/common/tests/test_soledad.py b/common/src/leap/soledad/common/tests/test_soledad.py index 8970a437..035c5ac5 100644 --- a/common/src/leap/soledad/common/tests/test_soledad.py +++ b/common/src/leap/soledad/common/tests/test_soledad.py @@ -33,6 +33,7 @@ from leap.soledad.common.tests import ( ) from leap import soledad from leap.soledad.common.document import SoledadDocument +from leap.soledad.common.crypto import WrongMac from leap.soledad.client import Soledad, PassphraseTooShort from leap.soledad.client.crypto import SoledadCrypto from leap.soledad.client.shared_db import SoledadSharedDatabase @@ -119,7 +120,7 @@ class AuxMethodsTestCase(BaseSoledadTest): sol.change_passphrase(u'654321') self.assertRaises( - DatabaseError, + WrongMac, self._soledad_instance, 'leap@leap.se', passphrase=u'123', prefix=self.rand_prefix) @@ -292,7 +293,7 @@ class SoledadSignalingTestCase(BaseSoledadTest): sol = self._soledad_instance() # create a document with secrets doc = SoledadDocument(doc_id=sol._shared_db_doc_id()) - doc.content = sol.export_recovery_document(include_uuid=False) + doc.content = sol.export_recovery_document() class Stage2MockSharedDB(object): |