[CalendarServer-changes] [1497] CalendarServer/trunk/twistedcaldav/test/test_tap.py

[source_changes at macosforge.org]

Revision: 1497
          http://trac.macosforge.org/projects/calendarserver/changeset/1497
Author:   dreid at apple.com
Date:     2007-04-24 11:49:12 -0700 (Tue, 24 Apr 2007)

Log Message:
-----------
Fix some ridiculously fragile unit tests :"

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-24 18:34:04 UTC (rev 1496)
+++ CalendarServer/trunk/twistedcaldav/test/test_tap.py	2007-04-24 18:49:12 UTC (rev 1497)
@@ -419,10 +419,10 @@
         site = self.getSite()
 
         self.failUnless(isinstance(
-                site.resource.resource.resource,
+                site.resource.resource,
                 auth.AuthenticationWrapper))
 
-        authWrapper = site.resource.resource.resource
+        authWrapper = site.resource.resource
 
         expectedSchemes = ['negotiate', 'digest', 'basic']
 
@@ -442,7 +442,7 @@
         self.writeConfig()
         site = self.getSite()
 
-        authWrapper = site.resource.resource.resource
+        authWrapper = site.resource.resource
 
         ncf = authWrapper.credentialFactories['negotiate']
         self.assertEquals(ncf.service, 'http/hello')
@@ -458,7 +458,7 @@
         self.writeConfig()
         site = self.getSite()
 
-        authWrapper = site.resource.resource.resource
+        authWrapper = site.resource.resource
 
         ncf = authWrapper.credentialFactories['negotiate']
         self.assertEquals(ncf.service, 'http/hello at bob')
@@ -477,7 +477,7 @@
         self.writeConfig()
         site = self.getSite()
 
-        authWrapper = site.resource.resource.resource
+        authWrapper = site.resource.resource
 
         expectedSchemes = ['digest']
 
@@ -495,7 +495,7 @@
         site = self.getSite()
 
         self.failUnless(isinstance(
-                site.resource.resource,
+                site.resource,
                 LogWrapperResource))
 
     def test_rootResource(self):
@@ -503,7 +503,7 @@
         Test the root resource
         """
         site = self.getSite()
-        root = site.resource.resource.resource.resource
+        root = site.resource.resource.resource
 
         self.failUnless(isinstance(root, CalDAVServiceMaker.rootResourceClass))
 
@@ -512,7 +512,7 @@
         Test the principal resource
         """
         site = self.getSite()
-        root = site.resource.resource.resource.resource
+        root = site.resource.resource.resource
 
         self.failUnless(isinstance(
                 root.getChild('principals'),
@@ -523,7 +523,7 @@
         Test the calendar resource
         """
         site = self.getSite()
-        root = site.resource.resource.resource.resource
+        root = site.resource.resource.resource
 
         self.failUnless(isinstance(
                 root.getChild('calendars'),
@@ -560,8 +560,8 @@
         to the same DirectoryService as the calendar hierarchy
         """
         site = self.getSite()
-        principals = site.resource.resource.resource.resource.getChild('principals')
-        calendars = site.resource.resource.resource.resource.getChild('calendars')
+        principals = site.resource.resource.resource.getChild('principals')
+        calendars = site.resource.resource.resource.getChild('calendars')
 
         self.assertEquals(principals.directory,
                           calendars.directory)
@@ -572,7 +572,7 @@
         an AggregateDirectoryService
         """
         site = self.getSite()
-        principals = site.resource.resource.resource.resource.getChild('principals')
+        principals = site.resource.resource.resource.getChild('principals')
         directory = principals.directory
 
         self.failUnless(isinstance(
@@ -591,7 +591,7 @@
         open(self.config['SudoersFile'], 'w').write(sudoersFile)
 
         site = self.getSite()
-        principals = site.resource.resource.resource.resource.getChild('principals')
+        principals = site.resource.resource.resource.getChild('principals')
         directory = principals.directory
 
         self.failUnless(self.config['SudoersFile'])
@@ -614,7 +614,7 @@
 
         self.writeConfig()
         site = self.getSite()
-        principals = site.resource.resource.resource.resource.getChild('principals')
+        principals = site.resource.resource.resource.getChild('principals')
         directory = principals.directory
 
         self.failUnless(self.config['SudoersFile'])
@@ -630,7 +630,7 @@
         the SudoersFile is not configured
         """
         site = self.getSite()
-        principals = site.resource.resource.resource.resource.getChild('principals')
+        principals = site.resource.resource.resource.getChild('principals')
         directory = principals.directory
 
         self.failIf(self.config['SudoersFile'])
@@ -646,7 +646,7 @@
         set in the configuration file.
         """
         site = self.getSite()
-        principals = site.resource.resource.resource.resource.getChild('principals')
+        principals = site.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/20070424/7406db94/attachment.html