sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-03-25 08:55:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DAV: Don't violate Storage API (#492)

Browse source 
The implementation of #476 is problematic as it returns None.
`vdirsyncer.sync` has internal assertions that this is a string, which
is why we get a crash like this:

    error: Unknown error occured for cal/markus@unterwaditzer.net:
    error: Use `-vdebug` to see the full traceback.
    debug:   File "/home/untitaker/projects/vdirsyncer/vdirsyncer/cli/tasks.py", line 66, in sync_collection
    debug:     force_delete=force_delete
    debug:   File "/home/untitaker/projects/vdirsyncer/vdirsyncer/sync.py", line 228, in sync
    debug:     action(a_info, b_info, conflict_resolution)
    debug:   File "/home/untitaker/projects/vdirsyncer/vdirsyncer/sync.py", line 276, in inner
    debug:     assert isinstance(dest_etag, (bytes, text_type))

Discovered in #467
This commit is contained in:
Markus Unterwaditzer 2016-08-19 19:58:38 +02:00 committed by GitHub
parent f8dffaf51e
commit f238a58c85
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/test_sync.py
View file

@ -422,8 +422,8 @@ class SyncMachine(RuleBasedStateMachine):
if null_etag_on_upload:
_old_upload = s.upload
_old_update = s.update
s.upload = lambda item: (_old_upload(item)[0], None)
s.update = lambda h, i, e: _old_update(h, i, e) and None
s.upload = lambda item: (_old_upload(item)[0], 'NULL')
s.update = lambda h, i, e: _old_update(h, i, e) and 'NULL'
return s

7
vdirsyncer/storage/dav.py
View file

@ -479,10 +479,9 @@ class DavStorage(Storage):
#
# -- https://tools.ietf.org/html/rfc7231#section-4.3.4
#
# In such cases we return None as etag. The next synchronization will
# then detect an etag change (None != some string) and will download
# the new item.
etag = response.headers.get('etag', None)
# In such cases we return a constant etag. The next synchronization
# will then detect an etag change and will download the new item.
etag = response.headers.get('etag', 'NULL')
href = self._normalize_href(response.url)
return href, etag