[CalendarServer-changes] [2041] CalendarServer/branches/users/wsanchez/cache-miss/twistedcaldav/ directory/test/test_opendirectoryschema.py

[source_changes at macosforge.org]

Revision: 2041
          http://trac.macosforge.org/projects/calendarserver/changeset/2041
Author:   wsanchez at apple.com
Date:     2007-12-05 11:30:10 -0800 (Wed, 05 Dec 2007)

Log Message:
-----------
cosmetic

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/cache-miss/twistedcaldav/directory/test/test_opendirectoryschema.py

Modified: CalendarServer/branches/users/wsanchez/cache-miss/twistedcaldav/directory/test/test_opendirectoryschema.py
===================================================================
--- CalendarServer/branches/users/wsanchez/cache-miss/twistedcaldav/directory/test/test_opendirectoryschema.py	2007-12-05 01:11:09 UTC (rev 2040)
+++ CalendarServer/branches/users/wsanchez/cache-miss/twistedcaldav/directory/test/test_opendirectoryschema.py	2007-12-05 19:30:10 UTC (rev 2041)
@@ -977,7 +977,7 @@
                 self.assertEqual(service.servicetags.pop(), "GUIDIFY:C18C34AC-3D9E-403C-8A33-BFC303F3840E:calendar")
 
         def test_expandcuaddrs(self):
-            def _doTest(recordName, record, result, title):
+            def doTest(recordName, record, result, title):
                 service = OpenDirectoryService(node="/Search", dosetup=False)
                 if not service._parseServiceInfo("calendar.apple.com", recordName, {
                 'dsAttrTypeNative:apple-serviceinfo'  : PlistParse.plist_good,
@@ -985,7 +985,7 @@
                 dsattributes.kDSNAttrMetaNodeLocation:  "/LDAPv3/127.0.0.1"}):
                     self.fail(msg="Plist parse should not have failed: %s" % (recordName,))
                 else:
-                    expanded = service._getCalendarUserAddresses(DirectoryService.recordType_users, recordName, record)
+                    expanded = service._calendarUserAddresses(DirectoryService.recordType_users, recordName, record)
 
                     # Verify that we extracted the proper items
                     self.assertEqual(expanded, result, msg=title % (expanded, result,))
@@ -1025,7 +1025,7 @@
             )
 
             for recordName, record, result, title in data:
-                _doTest(recordName, record, result, title)
+                doTest(recordName, record, result, title)
 
     class ODRecordsParse (twisted.trial.unittest.TestCase):
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20071205/b7494291/attachment.html