Ticket #2066: 2066.patch

twisted/internet/base.py

@@ -471 +471 @@
         self.running = False
         self._started = False
         self._justStopped = False
+        self._startedBefore = False
         # reactor internal readers, e.g. the waker.
         self._internalReaders = set()
         self.waker = None
@@ -570 +571 @@
                 "Can't stop reactor that isn't running.")
         self._stopped = True
         self._justStopped = True
+        self._startedBefore = True
 
 
     def crash(self):
@@ -668 +670 @@
         """
         if self._started:
             raise error.ReactorAlreadyRunning()
+        if self._startedBefore:
+            raise error.ReactorNotRestartable()
         self._started = True
         self._stopped = False
         threadable.registerAsIOThread()

twisted/internet/error.py

@@ -350 +350 @@
     """
 
 
+class ReactorNotRestartable(RuntimeError):
+    """
+    Error raised when trying to run a reactor which was stopped.
+    """
+
+
 
 class ReactorAlreadyRunning(RuntimeError):
     """

twisted/internet/test/test_core.py

@@ -12 +12 @@
 import inspect
 
 from twisted.internet.abstract import FileDescriptor
-from twisted.internet.error import ReactorAlreadyRunning
+from twisted.internet.error import ReactorAlreadyRunning, ReactorNotRestartable
 from twisted.internet.defer import Deferred
 from twisted.internet.test.reactormixins import ReactorBuilder
 
@@ -310 +310 @@
         self.assertEqual(events, ['crash', ('stop', True)])
 
 
+    def test_runAfterStop(self):
+        """
+        C{reactor.run()} raises L{ReactorNotRestartable} when called when
+        the reactor is being run after getting stopped priorly.
+        """
+        events = []
+        def restart():
+            self.assertRaises(ReactorNotRestartable, reactor.run)
+            events.append('tested')
+        reactor = self.buildReactor()
+        reactor.callWhenRunning(reactor.stop)
+        reactor.addSystemEventTrigger('after', 'shutdown', restart)
+        reactor.run()
+        self.assertEqual(events, ['tested'])
+
+
+
 globals().update(SystemEventTestsBuilder.makeTestCaseClasses())
 globals().update(ObjectModelIntegrationTest.makeTestCaseClasses())