[CalendarServer-changes] [6717] CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory .py
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jan 6 11:21:01 PST 2011
Revision: 6717
http://trac.macosforge.org/projects/calendarserver/changeset/6717
Author: wsanchez at apple.com
Date: 2011-01-06 11:20:54 -0800 (Thu, 06 Jan 2011)
Log Message:
-----------
Skip tests if we can't import the OD module.
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py 2011-01-05 19:46:03 UTC (rev 6716)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py 2011-01-06 19:20:54 UTC (rev 6717)
@@ -19,6 +19,7 @@
except ImportError:
pass
else:
+ from twisted.trial.unittest import SkipTest
import twext.web2.auth.digest
import twistedcaldav.directory.test.util
from twistedcaldav.directory import augment
@@ -52,7 +53,10 @@
def setUp(self):
super(OpenDirectory, self).setUp()
augment.AugmentService = augment.AugmentXMLDB(xmlFiles=())
- self._service = OpenDirectoryService({'node' : "/Search"}, dosetup=False)
+ try:
+ self._service = OpenDirectoryService({"node" : "/Search"}, dosetup=False)
+ except ImportError, e:
+ raise SkipTest("OpenDirectory module is not available: %s" % (e,))
def tearDown(self):
for call in self._service._delayedCalls:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110106/9d934494/attachment.html>
More information about the calendarserver-changes
mailing list