Fix more tests

git-svn-id: https://svn.calendarserver.org/repository/calendarserver/CalendarServer/branches/users/sagen/move2who-4@12935 e27351fd-9f3e-4f54-a53b-843176b1656c

calendarserver/accesslog.py

@@ -155,8 +155,9 @@ def emit(self, eventDict):
                 format += ' i=%(serverInstance)s'
                 formatArgs["serverInstance"] = config.LogID if config.LogID else "0"
 
-                format += ' or=%(outstandingRequests)s'
-                formatArgs["outstandingRequests"] = request.chanRequest.channel.factory.outstandingRequests
+                if request.chanRequest:  # This can be None during tests
+                    format += ' or=%(outstandingRequests)s'
+                    formatArgs["outstandingRequests"] = request.chanRequest.channel.factory.outstandingRequests
 
                 # Tags for time stamps collected along the way - the first one in the list is the initial
                 # time for request creation - we use that to track the entire request/response time

calendarserver/provision/root.py

@@ -160,7 +160,7 @@ def checkSacl(self, request):
         request.checkingSACL = True
 
         for collection in self.principalCollections():
-            principal = collection._principalForURI(authzUser.children[0].children[0].data)
+            principal = yield collection._principalForURI(authzUser.children[0].children[0].data)
             if principal is None:
                 response = (yield UnauthorizedResponse.makeResponse(
                     request.credentialFactories,