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 test

Browse source
This commit is contained in:
Markus Unterwaditzer 2015-09-12 16:41:15 +02:00
parent 661180b138
commit eb1485d99f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/test_sync.py
View file

@ -8,7 +8,7 @@ from vdirsyncer.storage.memory import MemoryStorage
from vdirsyncer.sync import BothReadOnly, IdentConflict, StorageEmpty, \ from vdirsyncer.sync import BothReadOnly, IdentConflict, StorageEmpty, \
SyncConflict, sync SyncConflict, sync
from . import assert_item_equals, blow_up, normalize_item from . import assert_item_equals, blow_up
def empty_storage(x): def empty_storage(x):
@ -138,7 +138,7 @@ def test_conflict_resolution_both_etags_new(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 = item_a.raw.splitlines()
assert u'UID:1' in n assert u'UID:1' in n
assert u'item {}'.format(winning_storage) in n assert u'item {}'.format(winning_storage) in n