[CalendarServer-changes] [7176] CalendarServer/trunk/calendarserver/tools/test/test_resources.py

[source_changes at macosforge.org]

Revision: 7176
          http://trac.macosforge.org/projects/calendarserver/changeset/7176
Author:   glyph at apple.com
Date:     2011-03-10 10:48:59 -0800 (Thu, 10 Mar 2011)
Log Message:
-----------
don't run tests for resource migration if dsattributes can't be loaded.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/test/test_resources.py

Modified: CalendarServer/trunk/calendarserver/tools/test/test_resources.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_resources.py	2011-03-10 18:09:29 UTC (rev 7175)
+++ CalendarServer/trunk/calendarserver/tools/test/test_resources.py	2011-03-10 18:48:59 UTC (rev 7176)
@@ -19,13 +19,17 @@
 from twistedcaldav.directory import augment
 from twistedcaldav.directory.directory import DirectoryService
 from twistedcaldav.test.util import TestCase
-import dsattributes
 
 
-strGUID = dsattributes.kDS1AttrGeneratedUID
-strName = dsattributes.kDS1AttrDistinguishedName
+try:
+    import dsattributes
+    strGUID = dsattributes.kDS1AttrGeneratedUID
+    strName = dsattributes.kDS1AttrDistinguishedName
+except ImportError:
+    dsattributes = None
 
 
+
 class StubDirectoryRecord(object):
 
     def __init__(self, recordType, guid=None, shortNames=None, fullName=None):
@@ -83,6 +87,9 @@
 
 class MigrateResourcesTestCase(TestCase):
 
+    if dsattributes is None:
+        skip = "dsattributes module not available"
+
     @inlineCallbacks
     def test_migrateResources(self):
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110310/edfc02e9/attachment-0001.html>