diff options
| author | drebs <drebs@leap.se> | 2013-01-10 13:18:48 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-10 13:18:48 -0200 |
| commit | 8909a16a12c17098ae8d5ecd31af6765b543622c (patch) | |
| tree | d336abb73dbd96edd5a80f9e16f3d26bac6cd79f /src/leap/soledad/tests/test_logs.py | |
| parent | 9b7728b80027f35c013a449b884235cf8eac503c (diff) | |
CouchDatabase passes all relevant u1db tests.
Diffstat (limited to 'src/leap/soledad/tests/test_logs.py')
| -rw-r--r-- | src/leap/soledad/tests/test_logs.py | 3 |
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( |