summaryrefslogtreecommitdiff
path: root/tests/test_logs.py
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-01-10 13:18:48 -0200
committerdrebs <drebs@leap.se>2013-01-10 13:18:48 -0200
commitea6c9852349b9b4894c00967bd2f7b7b7d287136 (patch)
tree85a16b1bb12b4ca7ef83b8f1aa8900da270ce0dc /tests/test_logs.py
parent8e32fdb0be5d34c6554a8c0f75bdf8bf0debcd4a (diff)
CouchDatabase passes all relevant u1db tests.
Diffstat (limited to 'tests/test_logs.py')
-rw-r--r--tests/test_logs.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/test_logs.py b/tests/test_logs.py
index 7fbb1cb7..2102b671 100644
--- a/tests/test_logs.py
+++ b/tests/test_logs.py
@@ -69,10 +69,11 @@ class LogTestCase(unittest.TestCase):
'error getting whats changed.')
def test_conflict_log(self):
+ # TODO: include tests for `get_conflicts` and `has_conflicts`.
data = [('1', 'my:1', 'irrelevant'),
('2', 'my:1', 'irrelevant'),
('3', 'my:1', 'irrelevant')]
- log = ConflictLog()
+ log = ConflictLog(None)
log.log = data
log.delete_conflicts([('1','my:1'),('2','my:1')])
self.assertEqual(