When using ReactorBuilder, twisted.internet.reactor points to the tem…

…porary reactor.

src/twisted/internet/test/reactormixins.py

@@ -216,7 +216,7 @@ def tearDown(self):
                         % (process.reapProcessHandlers,)
                     )
 
-    def unbuildReactor(self, reactor):
+    def unbuildReactor(self, reactor, global_reactor_was_munged=True):
         """
         Clean up any resources which may have been allocated for the given
         reactor by its creation or by a test which used it.
@@ -247,6 +247,13 @@ def unbuildReactor(self, reactor):
         for c in calls:
             c.cancel()
 
+        if global_reactor_was_munged:
+            # Restore the original reactor state:
+            from twisted.internet import reactor as globalReactor
+
+            globalReactor.__dict__ = reactor._originalReactorDict
+            globalReactor.__class__ = reactor._originalReactorClass
+
     def buildReactor(self):
         """
         Create and return a reactor using C{self.reactorFactory}.
@@ -268,6 +275,12 @@ def buildReactor(self):
                 )
         try:
             reactor = self.reactorFactory()
+            reactor._originalReactorDict = globalReactor.__dict__
+            reactor._originalReactorClass = globalReactor.__class__
+            # Make twisted.internet.reactor point to the new reactor,
+            # temporarily; this is undone in unbuildReactor().
+            globalReactor.__dict__ = reactor.__dict__
+            globalReactor.__class__ = reactor.__class__
         except BaseException:
             # Unfortunately, not all errors which result in a reactor
             # being unusable are detectable without actually

src/twisted/internet/test/test_gireactor.py

@@ -104,7 +104,7 @@ def test_gApplicationActivate(self) -> None:
         L{Gio.Application} instances can be registered with a gireactor.
         """
         reactor = gireactor.GIReactor(useGtk=False)
-        self.addCleanup(self.unbuildReactor, reactor)
+        self.addCleanup(self.unbuildReactor, reactor, False)
         app = Gio.Application(
             application_id="com.twistedmatrix.trial.gireactor",
             flags=Gio.ApplicationFlags.FLAGS_NONE,
@@ -139,7 +139,7 @@ def test_gtkApplicationActivate(self) -> None:
         L{Gtk.Application} instances can be registered with a gtk3reactor.
         """
         reactor = gireactor.GIReactor()
-        self.addCleanup(self.unbuildReactor, reactor)
+        self.addCleanup(self.unbuildReactor, reactor, False)
         app = Gtk.Application(
             application_id="com.twistedmatrix.trial.gtk3reactor",
             flags=Gio.ApplicationFlags.FLAGS_NONE,
@@ -152,7 +152,7 @@ def test_portable(self) -> None:
         registration at this time.
         """
         reactor = gireactor.PortableGIReactor()
-        self.addCleanup(self.unbuildReactor, reactor)
+        self.addCleanup(self.unbuildReactor, reactor, False)
         app = Gio.Application(
             application_id="com.twistedmatrix.trial.gireactor",
             flags=Gio.ApplicationFlags.FLAGS_NONE,
@@ -165,7 +165,7 @@ def test_noQuit(self) -> None:
         allow registration.
         """
         reactor = gireactor.GIReactor(useGtk=False)
-        self.addCleanup(self.unbuildReactor, reactor)
+        self.addCleanup(self.unbuildReactor, reactor, False)
         # An app with no "quit" method:
         app = object()
         exc = self.assertRaises(RuntimeError, reactor.registerGApplication, app)
@@ -177,7 +177,7 @@ def test_cantRegisterAfterRun(self) -> None:
         already started.
         """
         reactor = gireactor.GIReactor(useGtk=False)
-        self.addCleanup(self.unbuildReactor, reactor)
+        self.addCleanup(self.unbuildReactor, reactor, False)
         app = Gio.Application(
             application_id="com.twistedmatrix.trial.gireactor",
             flags=Gio.ApplicationFlags.FLAGS_NONE,
@@ -200,7 +200,7 @@ def test_cantRegisterTwice(self) -> None:
         It is not possible to register more than one C{Application}.
         """
         reactor = gireactor.GIReactor(useGtk=False)
-        self.addCleanup(self.unbuildReactor, reactor)
+        self.addCleanup(self.unbuildReactor, reactor, False)
         app = Gio.Application(
             application_id="com.twistedmatrix.trial.gireactor",
             flags=Gio.ApplicationFlags.FLAGS_NONE,

src/twisted/internet/test/test_tls.py

@@ -23,7 +23,6 @@
     ITLSTransport,
 )
 from twisted.internet.protocol import ClientFactory, Protocol, ServerFactory
-from twisted.internet.task import Cooperator
 from twisted.internet.test.connectionmixins import (
     BrokenContextFactory,
     ConnectionTestsMixin,
@@ -390,16 +389,6 @@ class AbortSSLConnectionTests(
     requiredInterfaces = (IReactorSSL,)
     endpoints = SSLCreator()
 
-    def buildReactor(self):
-        reactor = ReactorBuilder.buildReactor(self)
-        from twisted.internet import _producer_helpers
-
-        # Patch twisted.protocols.tls to use this reactor, until we get
-        # around to fixing #5206, or the TLS code uses an explicit reactor:
-        cooperator = Cooperator(scheduler=lambda x: reactor.callLater(0.00001, x))
-        self.patch(_producer_helpers, "cooperate", cooperator.cooperate)
-        return reactor
-
     def setUp(self):
         if FILETYPE_PEM is None:
             raise SkipTest("OpenSSL not available.")