summaryrefslogtreecommitdiff
path: root/tests/u1db_tests/test_document.py
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-01-24 12:03:45 -0200
committerdrebs <drebs@leap.se>2013-01-24 12:03:45 -0200
commit71df5a4431bce607550eec4425f4fdfbdbfa2af7 (patch)
treef71347068d0a9296c857a5027728130e7ed14ca8 /tests/u1db_tests/test_document.py
parent3bf11c9109a457ddbeb47524e34a5c1fd97bd27c (diff)
parent2f761fea9e72554806b012c64d00fcae80e1d254 (diff)
Merge branch 'feature/soledad-api' into develop
Conflicts: src/leap/soledad/util.py
Diffstat (limited to 'tests/u1db_tests/test_document.py')
-rw-r--r--tests/u1db_tests/test_document.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/u1db_tests/test_document.py b/tests/u1db_tests/test_document.py
index 2a0c0294..e706e1a9 100644
--- a/tests/u1db_tests/test_document.py
+++ b/tests/u1db_tests/test_document.py
@@ -23,7 +23,7 @@ from leap.soledad.tests import u1db_tests as tests
class TestDocument(tests.TestCase):
scenarios = ([(
- 'py', {'make_document_for_test': tests.make_document_for_test})]) #+
+ 'py', {'make_document_for_test': tests.make_document_for_test})]) # +
#tests.C_DATABASE_SCENARIOS)
def test_create_doc(self):
@@ -37,7 +37,7 @@ class TestDocument(tests.TestCase):
doc = self.make_document('doc-id', 'uid:1', tests.simple_doc)
self.assertEqual(
'%s(doc-id, uid:1, \'{"key": "value"}\')'
- % (doc.__class__.__name__,),
+ % (doc.__class__.__name__,),
repr(doc))
def test__repr__conflicted(self):
@@ -45,7 +45,7 @@ class TestDocument(tests.TestCase):
has_conflicts=True)
self.assertEqual(
'%s(doc-id, uid:1, conflicted, \'{"key": "value"}\')'
- % (doc.__class__.__name__,),
+ % (doc.__class__.__name__,),
repr(doc))
def test__lt__(self):