Ticket #4522: 0009-Test-PTYProcess.patch

twisted/internet/test/test_process.py

@@ -238 +238 @@
             "sys.stdout.write(str(process._listOpenFDs()))",
             "sys.stdout.flush()")
 
+        def checkOutput(output):
+            self.assertEquals('[0, 1, 2, 3]', output)
+
         reactor = self.buildReactor()
 
-        def processFinished(output):
-            self.assertEquals('[0, 1, 2, 3]', output)
+        class Protocol(ProcessProtocol):
 
-        def shutdown(result):
-            reactor.stop()
-            return result
+            def __init__(self):
+                self.output = []
 
-        def spawnChild():
-            msg("Spawning child with Twisted at %r" % (top.path,))
-            d = succeed(None)
-            d.addCallback(lambda dummy: utils.getProcessOutput(
-                sys.executable, ["-c", "\n".join(source)], reactor=reactor))
-            d.addCallback(processFinished)
-            d.addBoth(shutdown)
+            def outReceived(self, data):
+                self.output.append(data)
 
-        reactor.callWhenRunning(spawnChild)
+            def processEnded(self, reason):
+                try:
+                    checkOutput("".join(self.output))
+                finally:
+                    reactor.stop()
+
+        proto = Protocol()
+        reactor.callWhenRunning(
+            reactor.spawnProcess, proto, sys.executable,
+            [sys.executable, "-c", "\n".join(source)], usePTY=self.usePTY)
         self.runReactor(reactor)