[CalendarServer-changes] [3840] CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/ Twisted/twisted.web2.dav.test.test_resource.patch

[source_changes at macosforge.org]

Revision: 3840
          http://trac.macosforge.org/projects/calendarserver/changeset/3840
Author:   exarkun at twistedmatrix.com
Date:     2009-03-12 10:10:01 -0700 (Thu, 12 Mar 2009)
Log Message:
-----------
Resolve conflicts

Modified Paths:
--------------
    CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch

Modified: CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch
===================================================================
--- CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch	2009-03-12 16:57:44 UTC (rev 3839)
+++ CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch	2009-03-12 17:10:01 UTC (rev 3840)
@@ -1,67 +1,65 @@
 Index: twisted/web2/dav/test/test_resource.py
 ===================================================================
---- twisted/web2/dav/test/test_resource.py	(revision 19773)
+--- twisted/web2/dav/test/test_resource.py	(revision 26343)
 +++ twisted/web2/dav/test/test_resource.py	(working copy)
-@@ -192,13 +192,10 @@
- class AccessTests(TestCase):
-     def setUp(self):
-         gooduser = TestDAVPrincipalResource('/users/gooduser')
-+        gooduser.writeDeadProperty(TwistedPasswordProperty('goodpass'))
+@@ -203,12 +203,10 @@
+         TestCase.setUp(self)
  
+         gooduser = TestDAVPrincipalResource("/users/gooduser")
++        gooduser.writeDeadProperty(TwistedPasswordProperty("goodpass"))
+ 
 -        gooduser.writeDeadProperty(
--            TwistedPasswordProperty.fromString('goodpass'))
+-            TwistedPasswordProperty.fromString("goodpass"))
 -
-         baduser = TestDAVPrincipalResource('/users/baduser')
--        baduser.writeDeadProperty(
--            TwistedPasswordProperty.fromString('badpass'))
-+        baduser.writeDeadProperty(TwistedPasswordProperty('badpass'))
+         baduser = TestDAVPrincipalResource("/users/baduser")
+-        baduser.writeDeadProperty(TwistedPasswordProperty.fromString("badpass"))
++        baduser.writeDeadProperty(TwistedPasswordProperty("badpass"))
  
-         protected = TestResource('/protected')
+         protected = TestResource("/protected")
          protected.setAccessControlList(davxml.ACL(
-@@ -282,7 +279,8 @@
-         # Has auth; should allow
+@@ -290,7 +288,8 @@
  
+         # Has auth; should allow
          request = SimpleRequest(site, "GET", "/")
 -        request.user = davxml.Principal(davxml.HRef("/users/d00d"))
 +        request.authnUser = davxml.Principal(davxml.HRef("/users/d00d"))
 +        request.authzUser = davxml.Principal(davxml.HRef("/users/d00d"))
-         d = request.locateResource('/')
+         d = request.locateResource("/")
          d.addCallback(_checkPrivileges)
          d.addCallback(expectOK)
-@@ -301,6 +299,8 @@
-                       
+@@ -306,6 +305,8 @@
+         )
          return self.checkSecurity(request)
  
 +    test_authorize.todo = "Needs refactoring"
 +
      def test_badUsernameOrPassword(self):
-         request = SimpleRequest(self.site, 'GET', '/protected')
- 
-@@ -316,6 +316,8 @@
- 
+         request = SimpleRequest(self.site, "GET", "/protected")
+         request.headers.setHeader(
+@@ -316,6 +317,8 @@
+         d.addCallback(self.assertErrorResponse, responsecode.UNAUTHORIZED)
          return d
  
 +    test_badUsernameOrPassword.todo = "Needs refactoring."
 +
      def test_lacksPrivileges(self):
-         request = SimpleRequest(self.site, 'GET', '/protected')
+         request = SimpleRequest(self.site, "GET", "/protected")
+         request.headers.setHeader(
+@@ -345,11 +348,12 @@
+         )
+     )
  
-@@ -348,12 +350,12 @@
-             davxml.Grant(davxml.Privilege(davxml.All())),
-             davxml.Protected()))
- 
 -    def __init__(self, uri=None, children=None):
 +    def __init__(self, uri=None, children=None, principalCollections=()):
          """
          @param uri: A string respresenting the URI of the given resource
          @param children: a dictionary of names to Resources
          """
--
 +        DAVResource.__init__(self, principalCollections=principalCollections)
          self.children = children
          self.uri = uri
  
-@@ -380,8 +382,8 @@
+@@ -375,8 +379,8 @@
          return succeed(davPrivilegeSet)
  
      def currentPrincipal(self, request):
@@ -72,31 +70,18 @@
          else:
              return davxml.Principal(davxml.Unauthenticated())
  
-@@ -399,18 +401,21 @@
+@@ -398,7 +402,7 @@
  
-     def accessControlList(self, request, **kwargs):
-         return succeed(self.acl)
--    
- 
  class AuthAllResource (TestResource):
--    """Give Authenticated principals all privileges deny everything else
      """
+-    Give Authenticated principals all privileges deny everything else
 +    Give Authenticated principals all privileges and deny everyone else.
-+    """
+     """
      acl = davxml.ACL(
          davxml.ACE(
-             davxml.Principal(davxml.Authenticated()),
-             davxml.Grant(davxml.Privilege(davxml.All())),
--            davxml.Protected()))
--
-+            davxml.Protected()
-+        )
-+    )
-     
- class TestDAVPrincipalResource(DAVPrincipalResource, TestResource):
--    """Get deadProperties from TestResource
--    """
-+    # Get dead properties from TestResource
-+
+@@ -413,3 +417,5 @@
+     """
+     Get deadProperties from TestResource
+     """
 +    def principalURL(self):
 +        return self.uri
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090312/d829227e/attachment-0001.html>