[CalendarServer-changes] [13082] CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools /test/test_resources.py

[source_changes at macosforge.org]

Revision: 13082
          http://trac.calendarserver.org//changeset/13082
Author:   wsanchez at apple.com
Date:     2014-03-31 19:21:36 -0700 (Mon, 31 Mar 2014)
Log Message:
-----------
Stop using dsattributes

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_resources.py

Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_resources.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_resources.py	2014-04-01 02:02:50 UTC (rev 13081)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_resources.py	2014-04-01 02:21:36 UTC (rev 13082)
@@ -20,9 +20,8 @@
     from twisted.internet.defer import inlineCallbacks, succeed
     from twistedcaldav.directory.directory import DirectoryService
     from twistedcaldav.test.util import TestCase
-    import dsattributes
-    strGUID = dsattributes.kDS1AttrGeneratedUID
-    strName = dsattributes.kDS1AttrDistinguishedName
+    strGUID = "dsAttrTypeStandard:GeneratedUID"
+    strName = "dsAttrTypeStandard:RealName"
     RUN_TESTS = True
 except ImportError:
     RUN_TESTS = False
@@ -92,7 +91,7 @@
         def test_migrateResources(self):
 
             data = {
-                    dsattributes.kDSStdRecordTypeResources :
+                    "dsRecTypeStandard:Resources":
                     [
                         ['projector1', {
                             strGUID : '6C99E240-E915-4012-82FA-99E0F638D7EF',
@@ -103,7 +102,7 @@
                             strName : 'Projector 2'
                         }],
                     ],
-                    dsattributes.kDSStdRecordTypePlaces :
+                    "dsRecTypeStandard:Places":
                     [
                         ['office1', {
                             strGUID : '8C99E240-E915-4012-82FA-99E0F638D7EF',
@@ -131,13 +130,13 @@
             #
             # Add more to OD and re-migrate
             #
-            data[dsattributes.kDSStdRecordTypeResources].append(
+            data["dsRecTypeStandard:Resources"].append(
                 ['projector3', {
                     strGUID : '9C99E240-E915-4012-82FA-99E0F638D7EF',
                     strName : 'Projector 3'
                 }]
             )
-            data[dsattributes.kDSStdRecordTypePlaces].append(
+            data["dsRecTypeStandard:Places"].append(
                 ['office2', {
                     strGUID : 'AC99E240-E915-4012-82FA-99E0F638D7EF',
                     strName : 'Office 2'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140331/c23c41a6/attachment.html>