sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix useless test

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-03-16 11:50:14 +01:00
parent cd31e66798
commit 3df104a1f0
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/test_sync.py
View file

@ -43,7 +43,6 @@ def test_missing_status():
def test_missing_status_and_different_items(): def test_missing_status_and_different_items():
return # TODO
a = MemoryStorage() a = MemoryStorage()
b = MemoryStorage() b = MemoryStorage()
status = {} status = {}
@ -51,9 +50,12 @@ def test_missing_status_and_different_items():
item2 = Item(u'UID:1\nhoho') item2 = Item(u'UID:1\nhoho')
a.upload(item1) a.upload(item1)
b.upload(item2) b.upload(item2)
sync(a, b, status) with pytest.raises(exceptions.SyncConflict):
assert status sync(a, b, status)
assert_item_equals(a.get('1.txt')[0], b.get('1.txt')[0]) assert not status
sync(a, b, status, conflict_resolution='a wins')
assert_item_equals(item1, b.get('1.txt')[0])
assert_item_equals(item1, a.get('1.txt')[0])
def test_upload_and_update(): def test_upload_and_update():