[CalendarServer-changes] [12952] CalendarServer/branches/users/sagen/move2who-4

[source_changes at macosforge.org]

Revision: 12952
          http://trac.calendarserver.org//changeset/12952
Author:   sagen at apple.com
Date:     2014-03-18 13:24:11 -0700 (Tue, 18 Mar 2014)
Log Message:
-----------
Fix more tests

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/calendarserver/provision/test/test_root.py
    CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/test/util.py

Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/provision/test/test_root.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/provision/test/test_root.py	2014-03-18 20:22:20 UTC (rev 12951)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/provision/test/test_root.py	2014-03-18 20:24:11 UTC (rev 12952)
@@ -326,6 +326,7 @@
         self.actualRoot.responseCache = SACLCacheTests.StubResponseCacheResource()
 
 
+    @inlineCallbacks
     def test_PROPFIND(self):
         self.actualRoot.useSacls = True
 
@@ -337,56 +338,46 @@
 </D:prop>
 </D:propfind>
 """
+        record = yield self.directory.recordWithShortName(
+            RecordType.user,
+            u"dreid"
+        )
 
         request = SimpleStoreRequest(
             self,
             "PROPFIND",
             "/principals/users/dreid/",
-            headers=http_headers.Headers(
-                {
-                    'Authorization': [
-                        'basic', '%s' % ('dreid:dierd'.encode('base64'),)
-                    ],
-                    'Content-Type': 'application/xml; charset="utf-8"',
+            headers=http_headers.Headers({
                     'Depth': '1',
-                }
-            ),
+            }),
+            authRecord=record,
             content=body
         )
+        response = yield self.send(request)
+        response = IResponse(response)
 
-        def gotResponse1(response):
-            if response.code != responsecode.MULTI_STATUS:
-                self.fail("Incorrect response for PROPFIND /principals/: %s" % (response.code,))
+        if response.code != responsecode.MULTI_STATUS:
+            self.fail("Incorrect response for PROPFIND /principals/: %s" % (response.code,))
 
-            request = SimpleStoreRequest(
-                self,
-                "PROPFIND",
-                "/principals/users/dreid/",
-                headers=http_headers.Headers(
-                    {
-                        'Authorization': [
-                            'basic', '%s' % ('dreid:dierd'.encode('base64'),)
-                        ],
-                        'Content-Type': 'application/xml; charset="utf-8"',
-                        'Depth': '1',
-                    }
-                ),
-                content=body
-            )
+        request = SimpleStoreRequest(
+            self,
+            "PROPFIND",
+            "/principals/users/dreid/",
+            headers=http_headers.Headers({
+                    'Depth': '1',
+            }),
+            authRecord=record,
+            content=body
+        )
+        response = yield self.send(request)
+        response = IResponse(response)
 
-            d = self.send(request, gotResponse2)
-            return d
+        if response.code != responsecode.MULTI_STATUS:
+            self.fail("Incorrect response for PROPFIND /principals/: %s" % (response.code,))
+        self.assertEqual(self.actualRoot.responseCache.cacheHitCount, 1)
 
-        def gotResponse2(response):
-            if response.code != responsecode.MULTI_STATUS:
-                self.fail("Incorrect response for PROPFIND /principals/: %s" % (response.code,))
-            self.assertEqual(self.actualRoot.responseCache.cacheHitCount, 1)
 
-        d = self.send(request, gotResponse1)
-        return d
 
-
-
 class WikiTests(RootTests):
 
     @inlineCallbacks

Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/test/util.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/test/util.py	2014-03-18 20:22:20 UTC (rev 12951)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/test/util.py	2014-03-18 20:24:11 UTC (rev 12952)
@@ -129,7 +129,7 @@
 
         self.rootResource = getRootResource(config, self._sqlCalendarStore)
         self.actualRoot = self.rootResource.resource.resource
-        self.site = Site(self.rootResource)
+        self.site = Site(self.actualRoot)
 
         yield self.populate()
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140318/263b4f37/attachment-0001.html>