diff options
author | drebs <drebs@leap.se> | 2013-01-24 12:03:45 -0200 |
---|---|---|
committer | drebs <drebs@leap.se> | 2013-01-24 12:03:45 -0200 |
commit | e1494639f57cafddfd433c62adaa52a21f104e10 (patch) | |
tree | b9e6b700db7ab9d9b3f927222eb0f780e7c851d8 /src/leap/soledad/tests/u1db_tests/test_document.py | |
parent | 19da34c598ce6db172c1e1a8978bf031fc6db89b (diff) | |
parent | 1dec55b5c5054a4c42534c0f7e9b8bad5b82c27c (diff) |
Merge branch 'feature/soledad-api' into develop
Conflicts:
src/leap/soledad/util.py
Diffstat (limited to 'src/leap/soledad/tests/u1db_tests/test_document.py')
-rw-r--r-- | src/leap/soledad/tests/u1db_tests/test_document.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/soledad/tests/u1db_tests/test_document.py b/src/leap/soledad/tests/u1db_tests/test_document.py index 2a0c0294..e706e1a9 100644 --- a/src/leap/soledad/tests/u1db_tests/test_document.py +++ b/src/leap/soledad/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): |