[CalendarServer-changes] [5310] CalendarServer/branches/release/CalendarServer-2.5-dev/twistedcaldav /directory/test/test_opendirectory.py

[source_changes at macosforge.org]

Revision: 5310
          http://trac.macosforge.org/projects/calendarserver/changeset/5310
Author:   sagen at apple.com
Date:     2010-03-15 13:18:28 -0700 (Mon, 15 Mar 2010)
Log Message:
-----------
Hit the return key once in a while.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-2.5-dev/twistedcaldav/directory/test/test_opendirectory.py

Modified: CalendarServer/branches/release/CalendarServer-2.5-dev/twistedcaldav/directory/test/test_opendirectory.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.5-dev/twistedcaldav/directory/test/test_opendirectory.py	2010-03-15 20:00:30 UTC (rev 5309)
+++ CalendarServer/branches/release/CalendarServer-2.5-dev/twistedcaldav/directory/test/test_opendirectory.py	2010-03-15 20:18:28 UTC (rev 5310)
@@ -206,13 +206,38 @@
             def lookupMethod(obj, compound, casei, recordType, attributes, count=0):
                 if dsattributes.kDSStdRecordTypeUsers in recordType:
                     return [
-                        ('morgen', {'dsAttrTypeStandard:RecordType': 'dsRecTypeStandard:Users', 'dsAttrTypeStandard:AppleMetaNodeLocation': '/LDAPv3/od.apple.com', 'dsAttrTypeStandard:RecordName': ['morgen', 'Morgen Sagen'], 'dsAttrTypeStandard:FirstName': 'Morgen', 'dsAttrTypeStandard:GeneratedUID': '83479230-821E-11DE-B6B0-DBB02C6D659D', 'dsAttrTypeStandard:LastName': 'Sagen', 'dsAttrTypeStandard:EMailAddress': 'morgen at example.com', 'dsAttrTypeStandard:RealName': 'Morgen Sagen'}),
-                        ('morehouse', {'dsAttrTypeStandard:RecordType': 'dsRecTypeStandard:Users', 'dsAttrTypeStandard:AppleMetaNodeLocation': '/LDAPv3/od.apple.com', 'dsAttrTypeStandard:RecordName': ['morehouse', 'Joe Morehouse'], 'dsAttrTypeStandard:FirstName': 'Joe', 'dsAttrTypeStandard:GeneratedUID': '98342930-90DC-11DE-A842-A29601FB13E8', 'dsAttrTypeStandard:LastName': 'Morehouse', 'dsAttrTypeStandard:EMailAddress': 'morehouse at example.com', 'dsAttrTypeStandard:RealName': 'Joe Morehouse'}),
+                        ('morgen',
+                        {
+                            'dsAttrTypeStandard:RecordType': 'dsRecTypeStandard:Users',
+                            'dsAttrTypeStandard:AppleMetaNodeLocation': '/LDAPv3/127.0.0.1',
+                            'dsAttrTypeStandard:RecordName': ['morgen', 'Morgen Sagen'],
+                            'dsAttrTypeStandard:FirstName': 'Morgen',
+                            'dsAttrTypeStandard:GeneratedUID': '83479230-821E-11DE-B6B0-DBB02C6D659D',
+                            'dsAttrTypeStandard:LastName': 'Sagen',
+                            'dsAttrTypeStandard:EMailAddress': 'morgen at example.com',
+                            'dsAttrTypeStandard:RealName': 'Morgen Sagen'
+                        }),
+                        ('morehouse',
+                        {
+                            'dsAttrTypeStandard:RecordType': 'dsRecTypeStandard:Users',
+                            'dsAttrTypeStandard:AppleMetaNodeLocation': '/LDAPv3/127.0.0.1',
+                            'dsAttrTypeStandard:RecordName': ['morehouse', 'Joe Morehouse'],
+                            'dsAttrTypeStandard:FirstName': 'Joe',
+                            'dsAttrTypeStandard:GeneratedUID': '98342930-90DC-11DE-A842-A29601FB13E8',
+                            'dsAttrTypeStandard:LastName': 'Morehouse',
+                            'dsAttrTypeStandard:EMailAddress': 'morehouse at example.com',
+                            'dsAttrTypeStandard:RealName': 'Joe Morehouse'
+                        }),
                     ]
                 else:
                     return []
 
-            fields = [('fullName', 'mor', True, u'starts-with'), ('emailAddresses', 'mor', True, u'starts-with'), ('firstName', 'mor', True, u'starts-with'), ('lastName', 'mor', True, u'starts-with')]
+            fields = [
+                ('fullName', 'mor', True, u'starts-with'),
+                ('emailAddresses', 'mor', True, u'starts-with'),
+                ('firstName', 'mor', True, u'starts-with'),
+                ('lastName', 'mor', True, u'starts-with')
+            ]
 
             results = (yield self.service().recordsMatchingFields(fields, lookupMethod=lookupMethod))
             results = list(results)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100315/d81a4d51/attachment.html>