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

More tests for conflict resolution

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-04-11 22:46:42 +02:00
parent afbbafdb69
commit c18359466f
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tests/test_sync.py
View file

@ -123,7 +123,8 @@ def test_already_synced():
assert a.has('1.txt') and b.has('1.txt') assert a.has('1.txt') and b.has('1.txt')
def test_conflict_resolution_both_etags_new(): @pytest.mark.parametrize('winning_storage', 'ab')
def test_conflict_resolution_both_etags_new(winning_storage):
a = MemoryStorage() a = MemoryStorage()
b = MemoryStorage() b = MemoryStorage()
item = Item(u'UID:1') item = Item(u'UID:1')
@ -132,17 +133,28 @@ def test_conflict_resolution_both_etags_new():
status = {} status = {}
sync(a, b, status) sync(a, b, status)
assert status assert status
a.update(href_a, Item(u'UID:1\nASDASD'), etag_a) a.update(href_a, Item(u'UID:1\nitem a'), etag_a)
b.update(href_b, Item(u'UID:1\nHUEHUE'), etag_b) b.update(href_b, Item(u'UID:1\nitem b'), etag_b)
with pytest.raises(exceptions.SyncConflict): with pytest.raises(exceptions.SyncConflict):
sync(a, b, status) sync(a, b, status)
sync(a, b, status, conflict_resolution='a wins') sync(a, b, status, conflict_resolution='{} wins'.format(winning_storage))
item_a, _ = a.get(href_a) item_a, _ = a.get(href_a)
item_b, _ = b.get(href_b) item_b, _ = b.get(href_b)
assert_item_equals(item_a, item_b) assert_item_equals(item_a, item_b)
n = normalize_item(item_a) n = normalize_item(item_a)
assert u'UID:1' in n assert u'UID:1' in n
assert u'ASDASD' in n assert u'item {}'.format(winning_storage) in n
def test_conflict_resolution_invalid_mode():
a = MemoryStorage()
b = MemoryStorage()
item_a = Item(u'UID:1\nitem a')
item_b = Item(u'UID:1\nitem b')
a.upload(item_a)
b.upload(item_b)
with pytest.raises(ValueError):
sync(a, b, {}, conflict_resolution='yolo')
def test_conflict_resolution_new_etags_without_changes(): def test_conflict_resolution_new_etags_without_changes():