summaryrefslogtreecommitdiff
path: root/common/src/leap/soledad/common/tests/test_soledad.py
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-11-18 11:06:37 -0200
committerdrebs <drebs@leap.se>2013-11-19 11:24:47 -0200
commitd5d47dc216fd285ec60df1ccaab1e0740e29e3c5 (patch)
tree02157322e1d01119aee19f6081a99cd23991dd4d /common/src/leap/soledad/common/tests/test_soledad.py
parent930b7cd7e56440b638bd646b288f33063e15f3d0 (diff)
Add MAC verification to recovery document. Closes #4348.
Diffstat (limited to 'common/src/leap/soledad/common/tests/test_soledad.py')
-rw-r--r--common/src/leap/soledad/common/tests/test_soledad.py5
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):