[CalendarServer-changes] [1895]
CalendarServer/branches/release/CalendarServer-1.0-dev
source_changes at macosforge.org
source_changes at macosforge.org
Thu Sep 20 18:03:34 PDT 2007
Revision: 1895
http://trac.macosforge.org/projects/calendarserver/changeset/1895
Author: wsanchez at apple.com
Date: 2007-09-20 18:03:34 -0700 (Thu, 20 Sep 2007)
Log Message:
-----------
Pulled up r1883 r1884 r1888 r1890 r1891 from trunk.
Modified Paths:
--------------
CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch
CalendarServer/branches/release/CalendarServer-1.0-dev/test
Added Paths:
-----------
CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.conch.test.test_keys.patch
CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.test.test_tcp.patch
CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.test.test_static.patch
Copied: CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.conch.test.test_keys.patch (from rev 1888, CalendarServer/trunk/lib-patches/Twisted/twisted.conch.test.test_keys.patch)
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.conch.test.test_keys.patch (rev 0)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.conch.test.test_keys.patch 2007-09-21 01:03:34 UTC (rev 1895)
@@ -0,0 +1,16 @@
+Index: twisted/conch/test/test_keys.py
+===================================================================
+--- twisted/conch/test/test_keys.py (revision 19773)
++++ twisted/conch/test/test_keys.py (working copy)
+@@ -4,10 +4,10 @@
+
+ try:
+ import Crypto
++ from twisted.conch.ssh import keys
+ except ImportError:
+ Crypto = None
+
+-from twisted.conch.ssh import keys
+ from twisted.trial import unittest
+
+ publicRSA_openssh = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAGEArzJx8OYOnJmzf4tfBEvLi8DVPrJ3/c9k2I/Az64fxjHf9imyRJbixtQhlH9lfNjUIx+4LmrJH5QNRsFporcHDKOTwTTYLh5KmRpslkYHRivcJSkbh/C+BR3utDS555mV comment"
Copied: CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.test.test_tcp.patch (from rev 1890, CalendarServer/trunk/lib-patches/Twisted/twisted.test.test_tcp.patch)
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.test.test_tcp.patch (rev 0)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.test.test_tcp.patch 2007-09-21 01:03:34 UTC (rev 1895)
@@ -0,0 +1,13 @@
+Index: twisted/test/test_tcp.py
+===================================================================
+--- twisted/test/test_tcp.py (revision 19773)
++++ twisted/test/test_tcp.py (working copy)
+@@ -1294,6 +1294,8 @@
+ self.client.transport.loseConnection()
+ log.flushErrors(RuntimeError)
+ return d.addCallback(check)
++
++ testReadNotificationRaises.todo = "self.f.protocol is None"
+
+ def testWriteNotificationRaises(self):
+ self.client.writeConnectionLost = self.aBug
Modified: CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch 2007-09-21 01:02:47 UTC (rev 1894)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch 2007-09-21 01:03:34 UTC (rev 1895)
@@ -28,7 +28,25 @@
d = request.locateResource('/')
d.addCallback(_checkPrivileges)
d.addCallback(expectOK)
-@@ -348,12 +346,12 @@
+@@ -301,6 +299,8 @@
+
+ return self.checkSecurity(request)
+
++ test_authorize.todo = "Needs refactoring"
++
+ def test_badUsernameOrPassword(self):
+ request = SimpleRequest(self.site, 'GET', '/protected')
+
+@@ -316,6 +316,8 @@
+
+ return d
+
++ test_badUsernameOrPassword.todo = "Needs refactoring."
++
+ def test_lacksPrivileges(self):
+ request = SimpleRequest(self.site, 'GET', '/protected')
+
+@@ -348,12 +350,12 @@
davxml.Grant(davxml.Privilege(davxml.All())),
davxml.Protected()))
@@ -43,7 +61,7 @@
self.children = children
self.uri = uri
-@@ -380,8 +378,8 @@
+@@ -380,8 +382,8 @@
return succeed(davPrivilegeSet)
def currentPrincipal(self, request):
@@ -54,7 +72,7 @@
else:
return davxml.Principal(davxml.Unauthenticated())
-@@ -399,18 +397,21 @@
+@@ -399,18 +401,21 @@
def accessControlList(self, request, **kwargs):
return succeed(self.acl)
Copied: CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.test.test_static.patch (from rev 1884, CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test.test_static.patch)
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.test.test_static.patch (rev 0)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.test.test_static.patch 2007-09-21 01:03:34 UTC (rev 1895)
@@ -0,0 +1,10 @@
+Index: twisted/web2/dav/test/test_static.py
+===================================================================
+--- twisted/web2/dav/test/test_static.py (revision 19773)
++++ twisted/web2/dav/test/test_static.py (working copy)
+@@ -60,3 +60,5 @@
+ d.addCallback(assertListing)
+
+ return d
++
++ test_renderPrivileges.todo = "We changed the rules here; test needs an update"
Modified: CalendarServer/branches/release/CalendarServer-1.0-dev/test
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/test 2007-09-21 01:02:47 UTC (rev 1894)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/test 2007-09-21 01:03:34 UTC (rev 1895)
@@ -56,7 +56,7 @@
if [ $# -gt 0 ]; then
test_modules="$@";
else
- test_modules="twistedcaldav";
+ test_modules="twistedcaldav twisted";
fi;
cd "${wd}" && "${twisted}/bin/trial" ${random} ${until_fail} ${no_colour} ${test_modules};
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070920/8645b449/attachment.html
More information about the calendarserver-changes
mailing list