Ticket #5521: required-interfaces.patch

twisted/internet/test/test_tcp.py

@@ -22 +22 @@
 from twisted.internet.error import ConnectionDone, ConnectionAborted
 from twisted.internet.interfaces import (
     ILoggingContext, IResolverSimple, IConnector, IReactorFDSet,
-    ITLSTransport)
+    ITLSTransport, IReactorTCP)
 from twisted.internet.address import IPv4Address, IPv6Address
 from twisted.internet.defer import (
     Deferred, DeferredList, succeed, fail, maybeDeferred, gatherResults)
@@ -416 +416 @@
     """
     Builder defining tests relating to L{IReactorTCP.connectTCP}.
     """
+    requiredInterfaces = (IReactorTCP,)
+
     def serverEndpoint(self, reactor):
         """
         Create a L{TCP4ServerEndpoint} listening on localhost on a
@@ -740 +742 @@
     """
     Tests for L{IReactorTCP.listenTCP}
     """
+    requiredInterfaces = (IReactorTCP,)
+
     def getListeningPort(self, reactor, factory):
         """
         Get a TCP port from a reactor.
@@ -1064 +1068 @@
     """
     Builder defining tests relating to L{twisted.internet.tcp.Connection}.
     """
+    requiredInterfaces = (IReactorTCP,)
+
     def test_stopStartReading(self):
         """
         This test verifies transport socket read state after multiple
@@ -1213 +1219 @@
     @ivar server: the listening server factory to be used in tests.
     @type server: L{MyServerFactory}
     """
+    requiredInterfaces = (IReactorTCP,)
+
     def setUp(self):
         server = MyServerFactory()
         server.protocolConnectionMade = Deferred()
@@ -2038 +2046 @@
     TCP-specific L{AbortConnectionMixin} tests.
     """
 
+    requiredInterfaces = (IReactorTCP,)
+
     def listen(self, reactor, server):
         """
         Listen with the given protocol factory.

twisted/internet/test/test_threads.py

@@ -13 +13 @@
 from twisted.python.threadable import isInIOThread
 from twisted.internet.test.reactormixins import ReactorBuilder
 from twisted.python.threadpool import ThreadPool
+from twisted.internet.interfaces import IReactorThreads
 
 
 class ThreadTestsBuilder(ReactorBuilder):
     """
     Builder for defining tests relating to L{IReactorThreads}.
     """
+    requiredInterfaces = (IReactorThreads,)
+
     def test_getThreadPool(self):
         """
         C{reactor.getThreadPool()} returns an instance of L{ThreadPool} which

twisted/internet/test/test_time.py

@@ -9 +9 @@
 
 from twisted.python.runtime import platform
 from twisted.internet.test.reactormixins import ReactorBuilder
+from twisted.internet.interfaces import IReactorTime
 
 
 class TimeTestsBuilder(ReactorBuilder):
     """
     Builder for defining tests relating to L{IReactorTime}.
     """
+    requiredInterfaces = (IReactorTime,)
+
     def test_delayedCallStopsReactor(self):
         """
         The reactor can be stopped by a delayed call.
@@ -30 +33 @@
     Builder for defining tests relating to L{IReactorTime} for reactors based
     off glib.
     """
+    requiredInterfaces = (IReactorTime,)
+
     if platform.isWindows():
         _reactors = ["twisted.internet.gtk2reactor.PortableGtkReactor"]
     else:

twisted/internet/test/test_udp.py

@@ -16 +16 @@
 from twisted.python.log import ILogContext, err
 from twisted.internet.test.reactormixins import ReactorBuilder
 from twisted.internet.defer import Deferred, maybeDeferred
-from twisted.internet.interfaces import ILoggingContext, IListeningPort
+from twisted.internet.interfaces import (
+    ILoggingContext, IListeningPort, IReactorUDP)
 from twisted.internet.address import IPv4Address
 from twisted.internet.protocol import DatagramProtocol
 
@@ -133 +134 @@
     """
     Builder defining tests relating to L{IReactorUDP.listenUDP}.
     """
+    requiredInterfaces = (IReactorUDP,)
+
     def test_interface(self):
         """
         L{IReactorUDP.listenUDP} returns an object providing L{IListeningPort}.

twisted/internet/test/test_unix.py

@@ -63 +63 @@
     """
     Builder defining tests relating to L{IReactorUNIX}.
     """
+    requiredInterfaces = (interfaces.IReactorUNIX,)
+
     def serverEndpoint(self, reactor):
         """
         Construct a UNIX server endpoint.
@@ -132 +134 @@
     """
     Builder defining tests relating to L{IReactorUNIXDatagram}.
     """
+    requiredInterfaces = (interfaces.IReactorUNIXDatagram,)
+
     # There's no corresponding test_connectMode because the mode parameter to
     # connectUNIXDatagram has been completely ignored since that API was first
     # introduced.
@@ -164 +168 @@
     """
     Tests for L{IReactorUNIX.listenUnix}
     """
-    requiredInterfaces = [interfaces.IReactorUNIX]
+    requiredInterfaces = (interfaces.IReactorUNIX,)
 
     def getListeningPort(self, reactor, factory):
         """