LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix davacl test for secured content

pull/210/head
Francis Lachapelle 2016-05-31 10:48:34 -04:00
parent 98970712fd
commit 1b8bc408d1
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Tests/Integration/test-davacl.py
View File

@ -190,20 +190,27 @@ class DAVAclTest(unittest.TestCase):
delete = webdavlib.WebDAVDELETE(self.resource) delete = webdavlib.WebDAVDELETE(self.resource)
self.client.execute(delete) self.client.execute(delete)
def _versitLine(self, line): def _versitLine(self, previous_key, line):
key, value = line.split(":") if line[:1] == ' ' and previous_key:
semicolon = key.find(";") key, value = (previous_key, line[1:])
if semicolon > -1: else:
key = key[:semicolon] key, value = line.split(":")
semicolon = key.find(";")
if semicolon > -1:
key = key[:semicolon]
return (key, value) return (key, value)
def versitDict(self, event): def versitDict(self, event):
versitStruct = {} versitStruct = {}
key = ''
for line in event.splitlines(): for line in event.splitlines():
(key, value) = self._versitLine(line) (key, value) = self._versitLine(key, line)
if not (key == "BEGIN" or key == "END"): if not (key == "BEGIN" or key == "UID" or key == "END"):
versitStruct[key] = value if key in versitStruct:
versitStruct[key] += value
else:
versitStruct[key] = value
return versitStruct return versitStruct
@ -623,15 +630,9 @@ class DAVCalendarAclTest(DAVAclTest):
icsClass = self.classToICSClass[event_class] icsClass = self.classToICSClass[event_class]
expected_dict = { "VERSION": "2.0", expected_dict = { "VERSION": "2.0",
"PRODID": "-//Inverse//Event Generator//EN", "PRODID": "-//Inverse//Event Generator//EN",
"SEQUENCE": "0",
"TRANSP": "OPAQUE",
"UID": "12345-%s-%s-event.ics" % (icsClass,
icsClass.lower()),
"SUMMARY": "(%s event)" % icsClass.capitalize(), "SUMMARY": "(%s event)" % icsClass.capitalize(),
"DTSTART": "20090805T100000Z", "DTSTART": "20090805T100000Z",
"DTEND": "20090805T140000Z", "DTEND": "20090805T140000Z",
"CLASS": icsClass,
"CREATED": "20090805T100000Z",
"DTSTAMP": "20090805T100000Z", "DTSTAMP": "20090805T100000Z",
"X-SOGO-SECURE": "YES" } "X-SOGO-SECURE": "YES" }
event_dict = self.versitDict(event) event_dict = self.versitDict(event)