[CalendarServer-changes] [12105] twext/trunk/twext/internet/test/test_sendfdport.py

[source_changes at macosforge.org]

Revision: 12105
          http://trac.calendarserver.org//changeset/12105
Author:   wsanchez at apple.com
Date:     2013-12-13 20:20:55 -0800 (Fri, 13 Dec 2013)
Log Message:
-----------
We have a very unfortunate dependancy on txweb2 in here...

Modified Paths:
--------------
    twext/trunk/twext/internet/test/test_sendfdport.py

Modified: twext/trunk/twext/internet/test/test_sendfdport.py
===================================================================
--- twext/trunk/twext/internet/test/test_sendfdport.py	2013-12-14 04:18:37 UTC (rev 12104)
+++ twext/trunk/twext/internet/test/test_sendfdport.py	2013-12-14 04:20:55 UTC (rev 12105)
@@ -28,10 +28,18 @@
 
 from twext.internet.sendfdport import InheritedSocketDispatcher
 
-from twext.web2.metafd import ConnectionLimiter
 from twisted.internet.interfaces import IReactorFDSet
 from twisted.trial.unittest import TestCase
 
+try:
+    from txweb2.metafd import ConnectionLimiter
+except ImportError:
+    skip = "We have a very unfortunate dependancy on txweb2 in here..."
+else:
+    skip = False
+
+
+
 def verifiedImplementer(interface):
     def _(cls):
         result = implementer(interface)(cls)
@@ -138,13 +146,17 @@
         L{IStatusWatcher.closeCountFromStatus}.
         """
         self.dispatcher.statusWatcher = Watcher([])
+
         class SocketForClosing(object):
             blocking = True
             closed = False
+
             def setblocking(self, b):
                 self.blocking = b
+
             def fileno(self):
                 return object()
+
             def close(self):
                 self.closed = True
 
@@ -159,8 +171,10 @@
         self.dispatcher.sendFileDescriptor(one, "one")
         self.dispatcher.sendFileDescriptor(two, "two")
         self.dispatcher.sendFileDescriptor(three, "three")
+
         def sendfd(unixSocket, tcpSocket, description):
             pass
+
         # Put something into the socket-close queue.
         self.dispatcher._subprocessSockets[0].doWrite(sendfd)
         # Nothing closed yet.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/598cb8cc/attachment.html>