sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-08 11:15:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix http storage tests

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-03-28 20:45:02 +01:00
parent 8b7b55cdc2
commit 8f1531a4b2
2 changed files with 79 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

148
tests/storage/test_http.py
View file

@ -7,86 +7,94 @@
:license: MIT, see LICENSE for more details.
'''
import mock
from .. import assert_item_equals
from textwrap import dedent
from vdirsyncer.storage.http import HttpStorage, Item
from requests import Response
class TestHttpStorage(object):
def test_list(self):
def test_list(self, monkeypatch):
collection_url = 'http://127.0.0.1/calendar/collection/'
with mock.patch('requests.get') as p:
p.return_value = r = mock.Mock()
responses = [
dedent(b'''
BEGIN:VCALENDAR
VERSION:2.0
PRODID:http://www.example.com/calendarapplication/
METHOD:PUBLISH
BEGIN:VEVENT
UID:461092315540@example.com
LOCATION:Somewhere
SUMMARY:Eine Kurzinfo
DESCRIPTION:Beschreibung des Termines
CLASS:PUBLIC
DTSTART:20060910T220000Z
DTEND:20060919T215900Z
DTSTAMP:20060812T125900Z
END:VEVENT
BEGIN:VEVENT
UID:461092315asdasd540@example.com
LOCATION:Somewhere else
SUMMARY:Eine zweite Kurzinfo
DESCRIPTION:Beschreibung des anderen Termines
BEGIN:VALARM
ACTION:AUDIO
TRIGGER:19980403T120000
ATTACH;FMTTYPE=audio/basic:http://host.com/pub/ssbanner.aud
REPEAT:4
DURATION:PT1H
END:VALARM
END:VEVENT
END:VCALENDAR
''')
]
def get(*a, **kw):
r = Response()
r.status_code = 200
r.text = dedent(u'''
BEGIN:VCALENDAR
VERSION:2.0
PRODID:http://www.example.com/calendarapplication/
METHOD:PUBLISH
BEGIN:VEVENT
UID:461092315540@example.com
LOCATION:Somewhere
SUMMARY:Eine Kurzinfo
DESCRIPTION:Beschreibung des Termines
CLASS:PUBLIC
DTSTART:20060910T220000Z
DTEND:20060919T215900Z
DTSTAMP:20060812T125900Z
END:VEVENT
BEGIN:VEVENT
UID:461092315asdasd540@example.com
LOCATION:Somewhere else
SUMMARY:Eine zweite Kurzinfo
DESCRIPTION:Beschreibung des anderen Termines
BEGIN:VALARM
ACTION:AUDIO
TRIGGER:19980403T120000
ATTACH;FMTTYPE=audio/basic:http://host.com/pub/ssbanner.aud
REPEAT:4
DURATION:PT1H
END:VALARM
END:VEVENT
END:VCALENDAR
''')
s = HttpStorage(url=collection_url)
assert responses
r._content = responses.pop()
return r
l = list(s.list())
r.side_effect = IOError('Nope.')
hrefs = set(href for href, etag in l)
href1 = u'461092315540@example.com'
href2 = u'461092315asdasd540@example.com'
assert hrefs == set((href1, href2))
monkeypatch.setattr('requests.get', get)
item, etag = s.get(href1)
assert_item_equals(item, Item(dedent(u'''
BEGIN:VEVENT
UID:461092315540@example.com
LOCATION:Somewhere
SUMMARY:Eine Kurzinfo
DESCRIPTION:Beschreibung des Termines
CLASS:PUBLIC
DTSTART:20060910T220000Z
DTEND:20060919T215900Z
DTSTAMP:20060812T125900Z
END:VEVENT
''').strip()))
s = HttpStorage(url=collection_url)
l = list(s.list())
item, etag = s.get(href2)
assert_item_equals(item, Item(dedent(u'''
BEGIN:VEVENT
UID:461092315asdasd540@example.com
LOCATION:Somewhere else
SUMMARY:Eine zweite Kurzinfo
DESCRIPTION:Beschreibung des anderen Termines
BEGIN:VALARM
ACTION:AUDIO
TRIGGER:19980403T120000
ATTACH;FMTTYPE=audio/basic:http://host.com/pub/ssbanner.aud
REPEAT:4
DURATION:PT1H
END:VALARM
END:VEVENT
''').strip()))
hrefs = set(href for href, etag in l)
href1 = u'461092315540@example.com'
href2 = u'461092315asdasd540@example.com'
assert hrefs == set((href1, href2))
item, etag = s.get(href1)
assert_item_equals(item, Item(dedent(u'''
BEGIN:VEVENT
UID:461092315540@example.com
LOCATION:Somewhere
SUMMARY:Eine Kurzinfo
DESCRIPTION:Beschreibung des Termines
CLASS:PUBLIC
DTSTART:20060910T220000Z
DTEND:20060919T215900Z
DTSTAMP:20060812T125900Z
END:VEVENT
''').strip()))
item, etag = s.get(href2)
assert_item_equals(item, Item(dedent(u'''
BEGIN:VEVENT
UID:461092315asdasd540@example.com
LOCATION:Somewhere else
SUMMARY:Eine zweite Kurzinfo
DESCRIPTION:Beschreibung des anderen Termines
BEGIN:VALARM
ACTION:AUDIO
TRIGGER:19980403T120000
ATTACH;FMTTYPE=audio/basic:http://host.com/pub/ssbanner.aud
REPEAT:4
DURATION:PT1H
END:VALARM
END:VEVENT
''').strip()))

2
vdirsyncer/storage/http.py
View file

@ -109,7 +109,7 @@ class HttpStorage(HttpStorageBase):
def list(self):
if self._items is None:
r = requests.get(self.url, **self._settings)
r.raise_on_status()
r.raise_for_status()
self._items = {}
for item in split_collection(r.text):
self._items[item.uid] = item