[CalendarServer-changes] [1472]
CalendarServer/trunk/twistedcaldav/test/test_tap.py
source_changes at macosforge.org
source_changes at macosforge.org
Wed Apr 11 11:03:23 PDT 2007
Revision: 1472
http://trac.macosforge.org/projects/calendarserver/changeset/1472
Author: dreid at apple.com
Date: 2007-04-11 11:03:23 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
Fix broken unittests, there needs to be a better way to get to the real resource behind multiple wrapper resources.
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/test/test_tap.py
Modified: CalendarServer/trunk/twistedcaldav/test/test_tap.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_tap.py 2007-04-11 17:48:12 UTC (rev 1471)
+++ CalendarServer/trunk/twistedcaldav/test/test_tap.py 2007-04-11 18:03:23 UTC (rev 1472)
@@ -409,10 +409,10 @@
site = self.getSite()
self.failUnless(isinstance(
- site.resource.resource,
+ site.resource.resource.resource,
auth.AuthenticationWrapper))
- authWrapper = site.resource.resource
+ authWrapper = site.resource.resource.resource
expectedSchemes = ['negotiate', 'digest', 'basic']
@@ -432,7 +432,7 @@
self.writeConfig()
site = self.getSite()
- authWrapper = site.resource.resource
+ authWrapper = site.resource.resource.resource
ncf = authWrapper.credentialFactories['negotiate']
self.assertEquals(ncf.service, 'http/hello')
@@ -448,7 +448,7 @@
self.writeConfig()
site = self.getSite()
- authWrapper = site.resource.resource
+ authWrapper = site.resource.resource.resource
ncf = authWrapper.credentialFactories['negotiate']
self.assertEquals(ncf.service, 'http/hello at bob')
@@ -467,7 +467,7 @@
self.writeConfig()
site = self.getSite()
- authWrapper = site.resource.resource
+ authWrapper = site.resource.resource.resource
expectedSchemes = ['digest']
@@ -485,7 +485,7 @@
site = self.getSite()
self.failUnless(isinstance(
- site.resource,
+ site.resource.resource,
LogWrapperResource))
def test_rootResource(self):
@@ -493,7 +493,7 @@
Test the root resource
"""
site = self.getSite()
- root = site.resource.resource.resource
+ root = site.resource.resource.resource.resource
self.failUnless(isinstance(root, CalDAVServiceMaker.rootResourceClass))
@@ -502,7 +502,7 @@
Test the principal resource
"""
site = self.getSite()
- root = site.resource.resource.resource
+ root = site.resource.resource.resource.resource
self.failUnless(isinstance(
root.getChild('principals'),
@@ -513,7 +513,7 @@
Test the calendar resource
"""
site = self.getSite()
- root = site.resource.resource.resource
+ root = site.resource.resource.resource.resource
self.failUnless(isinstance(
root.getChild('calendars'),
@@ -550,8 +550,8 @@
to the same DirectoryService as the calendar hierarchy
"""
site = self.getSite()
- principals = site.resource.resource.resource.getChild('principals')
- calendars = site.resource.resource.resource.getChild('calendars')
+ principals = site.resource.resource.resource.resource.getChild('principals')
+ calendars = site.resource.resource.resource.resource.getChild('calendars')
self.assertEquals(principals.directory,
calendars.directory)
@@ -562,7 +562,7 @@
an AggregateDirectoryService
"""
site = self.getSite()
- principals = site.resource.resource.resource.getChild('principals')
+ principals = site.resource.resource.resource.resource.getChild('principals')
directory = principals.directory
self.failUnless(isinstance(
@@ -581,7 +581,7 @@
open(self.config['SudoersFile'], 'w').write(sudoersFile)
site = self.getSite()
- principals = site.resource.resource.resource.getChild('principals')
+ principals = site.resource.resource.resource.resource.getChild('principals')
directory = principals.directory
self.failUnless(self.config['SudoersFile'])
@@ -604,7 +604,7 @@
self.writeConfig()
site = self.getSite()
- principals = site.resource.resource.resource.getChild('principals')
+ principals = site.resource.resource.resource.resource.getChild('principals')
directory = principals.directory
self.failUnless(self.config['SudoersFile'])
@@ -620,7 +620,7 @@
the SudoersFile is not configured
"""
site = self.getSite()
- principals = site.resource.resource.resource.getChild('principals')
+ principals = site.resource.resource.resource.resource.getChild('principals')
directory = principals.directory
self.failIf(self.config['SudoersFile'])
@@ -636,7 +636,7 @@
set in the configuration file.
"""
site = self.getSite()
- principals = site.resource.resource.resource.getChild('principals')
+ principals = site.resource.resource.resource.resource.getChild('principals')
directory = principals.directory
realDirectory = directory.serviceForRecordType('users')
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070411/13d6e169/attachment.html
More information about the calendarserver-changes
mailing list