[CalendarServer-changes] [11213] CalDAVClientLibrary/trunk/caldavclientlibrary/protocol

[source_changes at macosforge.org]

Revision: 11213
          http://trac.calendarserver.org//changeset/11213
Author:   cdaboo at apple.com
Date:     2013-05-17 08:34:19 -0700 (Fri, 17 May 2013)
Log Message:
-----------
Fix unit tests.

Modified Paths:
--------------
    CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/requestresponse.py
    CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_lock.py
    CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_options.py
    CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propfindparser.py

Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/requestresponse.py
===================================================================
--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/requestresponse.py	2013-05-17 15:00:33 UTC (rev 11212)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/requestresponse.py	2013-05-17 15:34:19 UTC (rev 11213)
@@ -137,7 +137,10 @@
     def addHeaders(self, hdrs):
 
         # Write host
-        hdrs.append((headers.Host, "%s:%s" % (self.session.server, self.session.port,)))
+        host = self.session.server
+        if self.session.port != 80:
+            host += ":%s" % (self.session.port,)
+        hdrs.append((headers.Host, host))
 
         # Do ETag matching
         if self.etag:

Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_lock.py
===================================================================
--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_lock.py	2013-05-17 15:00:33 UTC (rev 11212)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_lock.py	2013-05-17 15:34:19 UTC (rev 11213)
@@ -126,6 +126,6 @@
         server = Session("www.example.com")
         request = Lock(server, "/", headers.Depth0, Lock.eExclusive, "user at example.com", -1)
         request.getResponseHeaders().update({
-            "Lock-Token": ("<user at example.com>",),
+            "lock-token": ("<user at example.com>",),
         })
         self.assertEqual(request.getLockToken(), "user at example.com")

Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_options.py
===================================================================
--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_options.py	2013-05-17 15:00:33 UTC (rev 11212)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_options.py	2013-05-17 15:34:19 UTC (rev 11213)
@@ -51,7 +51,7 @@
         server = Session("www.example.com")
         request = Options(server, "/")
         request.getResponseHeaders().update({
-            "Allow": ("GET, PUT, OPTIONS, HEAD",),
+            "allow": ("GET, PUT, OPTIONS, HEAD",),
         })
         self.assertEqual(set(request.getAllowed()), set(("GET", "PUT", "OPTIONS", "HEAD")))
         self.assertTrue(request.isAllowed("GET"))
@@ -65,7 +65,7 @@
         server = Session("www.example.com")
         request = Options(server, "/")
         request.getResponseHeaders().update({
-            "Allow": ("GET, PUT", "OPTIONS, HEAD",),
+            "allow": ("GET, PUT", "OPTIONS, HEAD",),
         })
         self.assertEqual(set(request.getAllowed()), set(("GET", "PUT", "OPTIONS", "HEAD")))
         self.assertTrue(request.isAllowed("GET"))

Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propfindparser.py
===================================================================
--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propfindparser.py	2013-05-17 15:00:33 UTC (rev 11212)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propfindparser.py	2013-05-17 15:34:19 UTC (rev 11213)
@@ -136,4 +136,4 @@
 """)
         results = parser.getResults()
         result = results["/calendars/__uids__/user01/inbox/event.ics"]
-        self.assertEqual("HTTP/1.1 404 Not Found", result.getStatus())
+        self.assertEqual(404, result.getStatus())
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130517/f7e112fc/attachment-0001.html>