Imported Upstream version 1.2.1

[platform/upstream/python-nose.git] / nose / twistedtools.py

diff --git a/nose/twistedtools.py b/nose/twistedtools.py
index 3720610..8d9c6ff 100644 (file)
--- a/nose/twistedtools.py
+++ b/nose/twistedtools.py
@@ -70,7 +70,12 @@ def stop_reactor():
     you mix tests using these tools and tests using twisted.trial.
     """
     global _twisted_thread
-    reactor.stop()
+
+    def stop_reactor():
+        '''Helper for calling stop from withing the thread.'''
+        reactor.stop()
+
+    reactor.callFromThread(stop_reactor)
     reactor_thread.join()
     for p in reactor.getDelayedCalls():
         if p.active():