[CalendarServer-changes] [8950] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 8950
          http://trac.macosforge.org/projects/calendarserver/changeset/8950
Author:   glyph at apple.com
Date:     2012-03-29 02:55:11 -0700 (Thu, 29 Mar 2012)
Log Message:
-----------
Minor test tweaks for IPv6 changes.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
    CalendarServer/trunk/twext/web2/test/test_metafd.py

Property Changed:
----------------
    CalendarServer/trunk/

Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2012-03-29 07:35:00 UTC (rev 8949)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2012-03-29 09:55:11 UTC (rev 8950)
@@ -551,7 +551,8 @@
                     serviceArgs[0],
                     dict(expectedSubServices)[serviceClass]
                 )
-        self.assertEquals(checked, len(expectedSubServices))
+        # TCP+SSL services for IPv4, TCP+SSL services for IPv6.
+        self.assertEquals(checked, 4)
 
 
     def test_SSLKeyConfiguration(self):

Modified: CalendarServer/trunk/twext/web2/test/test_metafd.py
===================================================================
--- CalendarServer/trunk/twext/web2/test/test_metafd.py	2012-03-29 07:35:00 UTC (rev 8949)
+++ CalendarServer/trunk/twext/web2/test/test_metafd.py	2012-03-29 09:55:11 UTC (rev 8950)
@@ -19,7 +19,7 @@
 Tests for twext.web2.metafd.
 """
 
-from socket import error as SocketError
+from socket import error as SocketError, AF_INET
 from errno import ENOTCONN
 
 from twext.web2 import metafd
@@ -116,9 +116,12 @@
             return "not an fd", "not a description"
         def fakeclose(fd):
             ""
+        def fakegetsockfam(fd):
+            return AF_INET
         self.patch(sendfdport, 'recvfd', fakerecvfd)
         self.patch(sendfdport, 'fromfd', fakefromfd)
         self.patch(sendfdport, 'close', fakeclose)
+        self.patch(sendfdport, 'getsockfam', fakegetsockfam)
         self.patch(metafd, 'InheritedPort', InheritedPortForTesting)
         self.patch(metafd, 'Server', ServerTransportForTesting)
         # This last stubbed out just to prevent dirty reactor warnings.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120329/89bd8123/attachment.html>