r47272 - fixes

Author: hawkowl
Date: Sun Apr 17 00:11:16 2016
New Revision: 47272

Modified:
   branches/cov-subprocess-8266/twisted/internet/test/test_process.py
   branches/cov-subprocess-8266/twisted/python/dist3.py
   branches/cov-subprocess-8266/twisted/python/test/test_dist3.py
   branches/cov-subprocess-8266/twisted/test/test_process.py
   branches/cov-subprocess-8266/twisted/test/test_stdio.py

Log:
fixes

Modified: branches/cov-subprocess-8266/twisted/internet/test/test_process.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/internet/test/test_process.py	(original)
+++ branches/cov-subprocess-8266/twisted/internet/test/test_process.py	Sun Apr 17 00:11:16 2016
@@ -47,6 +47,7 @@
     if os.getuid() != 0:
         _uidgidSkip = "Cannot change UID/GID except as root"
     properEnv = dict(os.environ)
+    properEnv["PYTHONPATH"] = os.pathsep.join(sys.path)
 
 
 
@@ -733,7 +734,7 @@
         reactor = self.buildReactor()
         reactor.callWhenRunning(
             reactor.spawnProcess, Waiter(), pyExe,
-            [pyExe, b"-m", self.keepStdioOpenProgram, b"child",
+            [pyExe, b"-u", b"-m", self.keepStdioOpenProgram, b"child",
              self.keepStdioOpenArg],
             env=properEnv, usePTY=self.usePTY)
 
@@ -834,7 +835,8 @@
         def spawnChild():
             d = succeed(None)
             d.addCallback(lambda dummy: utils.getProcessOutputAndValue(
-                pyExe, [b"-m", us] + args, env=properEnv, reactor=reactor))
+                pyExe, [b"-m", us] + args, env=properEnv,
+                reactor=reactor))
             d.addCallback(processFinished)
             d.addBoth(shutdown)
 

Modified: branches/cov-subprocess-8266/twisted/python/dist3.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/python/dist3.py	(original)
+++ branches/cov-subprocess-8266/twisted/python/dist3.py	Sun Apr 17 00:11:16 2016
@@ -458,7 +458,6 @@
     "twisted.positioning.test.receiver",
     "twisted.python.test.pullpipe",
     "twisted.python.test.pullpipe",
-    "twisted.test._preamble",
     "twisted.test.plugin_basic",
     "twisted.test.plugin_extra1",
     "twisted.test.plugin_extra2",

Modified: branches/cov-subprocess-8266/twisted/python/test/test_dist3.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/python/test/test_dist3.py	(original)
+++ branches/cov-subprocess-8266/twisted/python/test/test_dist3.py	Sun Apr 17 00:11:16 2016
@@ -49,4 +49,5 @@
         root = os.path.dirname(os.path.dirname(twisted.__file__))
         for file in testDataFiles:
             self.assertTrue(os.path.exists(
-                os.path.join(root, os.path.sep.join(file.split(".")) + ".py")))
+                os.path.join(root, os.path.sep.join(file.split(".")) + ".py")),
+                            "Data file {0} does not exist".format(file))

Modified: branches/cov-subprocess-8266/twisted/test/test_process.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/test/test_process.py	(original)
+++ branches/cov-subprocess-8266/twisted/test/test_process.py	Sun Apr 17 00:11:16 2016
@@ -54,6 +54,7 @@
         sys.getfilesystemencoding())
 else:
     properEnv = dict(os.environ)
+    properEnv["PYTHONPATH"] = os.pathsep.join(sys.path)
 
 
 class StubProcessProtocol(protocol.ProcessProtocol):

Modified: branches/cov-subprocess-8266/twisted/test/test_stdio.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/test/test_stdio.py	(original)
+++ branches/cov-subprocess-8266/twisted/test/test_stdio.py	Sun Apr 17 00:11:16 2016
@@ -33,6 +33,7 @@
         skipWindowsNopywin32 = ("On windows, spawnProcess is not available "
                                 "in the absence of win32process.")
     properEnv = dict(os.environ)
+    properEnv["PYTHONPATH"] = os.pathsep.join(sys.path)
 else:
     properEnv = bytesEnviron()
     properEnv[b"PYTHONPATH"] = os.pathsep.join(sys.path).encode(