[CalendarServer-changes] [12319] twext/trunk/twext/who/ldap/test/test_service.py
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:17:29 PDT 2014
Revision: 12319
http://trac.calendarserver.org//changeset/12319
Author: wsanchez at apple.com
Date: 2014-01-11 18:08:50 -0800 (Sat, 11 Jan 2014)
Log Message:
-----------
Move the chairs around
Modified Paths:
--------------
twext/trunk/twext/who/ldap/test/test_service.py
Modified: twext/trunk/twext/who/ldap/test/test_service.py
===================================================================
--- twext/trunk/twext/who/ldap/test/test_service.py 2014-01-12 00:51:24 UTC (rev 12318)
+++ twext/trunk/twext/who/ldap/test/test_service.py 2014-01-12 02:08:50 UTC (rev 12319)
@@ -65,7 +65,7 @@
-class DirectoryServiceConvenienceTestMixIn(BaseTestCase):
+class DirectoryServiceConvenienceTestMixIn(object):
def _unimplemented(self):
raise NotImplementedError()
@@ -80,15 +80,7 @@
-class DirectoryServiceTest(
- DirectoryServiceConvenienceTestMixIn,
- test_directory.BaseDirectoryServiceTest,
- unittest.TestCase,
-):
- serviceClass = DirectoryService
- directoryRecordClass = DirectoryRecord
-
-
+class DirectoryServiceConnectionTestMixIn(object):
@inlineCallbacks
def test_connect_defaults(self):
"""
@@ -191,6 +183,18 @@
+class DirectoryServiceTest(
+ BaseTestCase,
+ DirectoryServiceConvenienceTestMixIn,
+ DirectoryServiceConnectionTestMixIn,
+ test_directory.BaseDirectoryServiceTest,
+ unittest.TestCase,
+):
+ serviceClass = DirectoryService
+ directoryRecordClass = DirectoryRecord
+
+
+
def mockDirectoryDataFromXML(tmp):
service = xmlService(tmp)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/c81f5c5a/attachment.html>
More information about the calendarserver-changes
mailing list