summaryrefslogtreecommitdiff
path: root/src/leap/soledad/tests/test_logs.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/soledad/tests/test_logs.py')
-rw-r--r--src/leap/soledad/tests/test_logs.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/soledad/tests/test_logs.py b/src/leap/soledad/tests/test_logs.py
index 7fbb1cb7..2102b671 100644
--- a/src/leap/soledad/tests/test_logs.py
+++ b/src/leap/soledad/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(