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

Monotone-Parent: 44fc3e25d97f062f2add05e5d39a9ffb983d11ca 

Monotone-Revision: 89b96d9d2226f3bc49b522e79b43098dfa922b34

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-09T18:31:17
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-04-09 18:31:17 +00:00
parent db0044c1e3
commit c8cb1b9e39
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2010-04-09 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Tests/Integration/utilities.py (TestUtility.fetchUserInfo): same
as below.
* Tests/Integration/test-webdav.py
(WebDAVTest.testExpandProperty): same as below
* Tests/Integration/test-caldav-scheduling.py (fetchUserInfo):
accept empty displayname property.
* Tests/Integration/test-maildav.py: temporarily disabled test
2010-04-08 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/UIxMailEditor.m (-fromEMails, -from): make use of

6
Tests/Integration/test-caldav-scheduling.py
View File

@ -30,8 +30,12 @@ def fetchUserInfo(login):
None)
email_nodes = propfind.xpath_evaluate('/D:multistatus/D:response/D:propstat/D:prop/C:calendar-user-address-set/D:href',
None)
if len(name_nodes[0].childNodes) > 0:
displayName = name_nodes[0].childNodes[0].nodeValue
else:
displayName = ""
return (name_nodes[0].childNodes[0].nodeValue, email_nodes[0].childNodes[0].nodeValue)
return (displayName, email_nodes[0].childNodes[0].nodeValue)
class CalDAVITIPDelegationTest(unittest.TestCase):
def setUp(self):

6
Tests/Integration/test-webdav.py
View File

@ -143,8 +143,12 @@ class WebDAVTest(unittest.TestCase):
propHref.childNodes[0].nodeValue))
propDisplayname = query.xpath_evaluate('D:response/D:propstat/D:prop/D:displayname',
propResponse)[0]
if len(propDisplayname.childNodes) > 0:
displayName = propDisplayname.childNodes[0].nodeValue
else:
displayName = ""
self.assertEquals(query_props[query_prop]["displayname"],
propDisplayname.childNodes[0].nodeValue,
displayName,
"'%s', displayname mismatch: exp. '%s', got '%s'"
% (query_prop,
query_props[query_prop]["displayname"],

8
Tests/Integration/utilities.py
View File

@ -23,8 +23,12 @@ class TestUtility(unittest.TestCase):
None)
email_nodes = propfind.xpath_evaluate('/D:multistatus/D:response/D:propstat/D:prop/C:calendar-user-address-set/D:href',
None)
self.userInfo[login] = (name_nodes[0].childNodes[0].nodeValue,
email_nodes[0].childNodes[0].nodeValue)
if len(name_nodes[0].childNodes) > 0:
displayName = name_nodes[0].childNodes[0].nodeValue
else:
displayName = ""
self.userInfo[login] = (displayName, email_nodes[0].childNodes[0].nodeValue)
return self.userInfo[login]