ghost · Jul 31, 2017 · Jul 31, 2017 · Jul 31, 2017 · Aug 1, 2017 · Aug 9, 2017
diff --git a/appveyor.yml b/appveyor.yml
@@ -15,7 +15,7 @@ environment:
     # See: http://stackoverflow.com/a/13751649/163740
     CMD_IN_ENV: 'cmd /E:ON /V:ON /C .\tests\scripts\appveyor\run_with_env.cmd'
 
-  PYTEST: py.test --maxfail 5 --durations=10 --junitxml=junit-results.xml
+  PYTEST: py.test -n3 --maxfail 5 --durations=10 --junitxml=junit-results.xml
   # Break the tests into two runs, since together they exceed the 1 hour limit.
   # See https://github.com/pyinstaller/pyinstaller/issues/2024#issuecomment-224129520
   # for more discussion.
@@ -27,63 +27,26 @@ environment:
     - PYTHON: C:\Python36-x64
       PYTHON_VERSION: 3.6
       PYTHON_ARCH: 64
-      TEST_LIBRARIES: NO
-
-    - PYTHON: C:\Python36-x64
-      PYTHON_VERSION: 3.6
-      PYTHON_ARCH: 64
-      TEST_LIBRARIES: YES
-
-    - PYTHON: C:\Python36
-      PYTHON_VERSION: 3.6
-      PYTHON_ARCH: 32
-      TEST_LIBRARIES: NO
 
     - PYTHON: C:\Python36
       PYTHON_VERSION: 3.6
       PYTHON_ARCH: 32
-      TEST_LIBRARIES: YES
 
     - PYTHON: C:\Python35
       PYTHON_VERSION: 3.5
       PYTHON_ARCH: 32
-      TEST_LIBRARIES: NO
-
-    - PYTHON: C:\Python35
-      PYTHON_VERSION: 3.5
-      PYTHON_ARCH: 32
-      TEST_LIBRARIES: YES
 
     - PYTHON: C:\Python34
       PYTHON_VERSION: 3.4
       PYTHON_ARCH: 32
-      TEST_LIBRARIES: NO
-
-    - PYTHON: C:\Python34
-      PYTHON_VERSION: 3.4
-      PYTHON_ARCH: 32
-      TEST_LIBRARIES: YES
 
     - PYTHON: C:\Python33
       PYTHON_VERSION: 3.3
       PYTHON_ARCH: 32
-      TEST_LIBRARIES: NO
-
-    - PYTHON: C:\Python33
-      PYTHON_VERSION: 3.3
-      PYTHON_ARCH: 32
-      TEST_LIBRARIES: YES
 
     - PYTHON: C:\Python27
       PYTHON_VERSION: 2.7
       PYTHON_ARCH: 32
-      TEST_LIBRARIES: NO
-
-    - PYTHON: C:\Python27
-      PYTHON_VERSION: 2.7
-      PYTHON_ARCH: 32
-      TEST_LIBRARIES: YES
-
 
 init:
   - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
@@ -136,11 +99,7 @@ install:
 
   # Install the PyInstaller test dependencies.
   - '%CMD_IN_ENV% pip install -U --timeout 5 --retries 2
-        -r tests/requirements-tools.txt'
-  - 'if "%TEST_LIBRARIES%" == "YES" (
-        %CMD_IN_ENV% pip install -U --timeout 5 --retries 2
-             -r tests/requirements-libraries.txt
-    )'
+        -r tests/requirements-libraries.txt -r tests/requirements-tools.txt'
   # Install PyInstaller into virtualenv.
   - '%CMD_IN_ENV% pip install -e .'
 
@@ -150,11 +109,8 @@ test_script:
   # Run the tests appropriate for this entry in the test matrix. Skip tests
   # if we're just updating the cache.
   - 'if not "%APPVEYOR_SCHEDULED_BUILD%" == "True" (
-        if /i "%TEST_LIBRARIES%" == "YES" (
-          %CMD_IN_ENV% %PYTEST% %TESTS_LIBRARIES%
-        ) else (
-          %CMD_IN_ENV% %PYTEST% %TESTS_UNITTESTS%
-    ))'
+          %CMD_IN_ENV% %PYTEST% 2> nul
+    )'
 
 on_success:
   # Remove old or huge cache files to hopefully not exceed the 1GB cache limit.
@@ -173,6 +129,7 @@ on_success:
 
 on_finish:
   - ps: |
+      python .\scripts\compact-junit.py junit-results.xml
       (new-object net.webclient).UploadFile(
         "https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)",
         (Resolve-Path .\junit-results.xml)

diff --git a/scripts/compact-junit.py b/scripts/compact-junit.py
@@ -0,0 +1,17 @@
+import sys
+
+from junitparser import JUnitXml, Failure
+
+
+def main():
+    junit_xml_file = sys.argv[1]
+    suite = JUnitXml.fromfile(junit_xml_file)
+    for case in suite:
+        if not isinstance(case.result, Failure):
+            case.system_out = ''
+            case.system_err = ''
+    suite.write()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -26,6 +26,8 @@
 import textwrap
 import io
 import shutil
+import tempfile
+import shutil
 
 # Third-party imports
 # -------------------
@@ -41,7 +43,7 @@
 from PyInstaller import configure, config
 from PyInstaller import __main__ as pyi_main
 from PyInstaller.utils.cliutils import archive_viewer
-from PyInstaller.compat import is_darwin, is_win, is_py2, safe_repr, \
+from PyInstaller.compat import is_darwin, is_win, is_py2, is_py3, safe_repr, \
   architecture
 from PyInstaller.depend.analysis import initialize_modgraph
 from PyInstaller.utils.win32 import winutils
@@ -343,27 +345,59 @@ def _run_executable(self, prog, args, run_from_path, runtime):
         # Windows command prompt. Py.test is then able to collect stdout/sterr
         # messages and display them if a test fails.
 
-        process = psutil.Popen(args, executable=exe_path, stdout=sys.stdout,
-                               stderr=sys.stderr, env=prog_env, cwd=prog_cwd)
-        # 'psutil' allows to use timeout in waiting for a subprocess.
-        # If not timeout was specified then it is 'None' - no timeout, just waiting.
-        # Runtime is useful mostly for interactive tests.
-        try:
-            timeout = runtime if runtime else _EXE_TIMEOUT
-            retcode = process.wait(timeout=timeout)
-        except psutil.TimeoutExpired:
+        # Note that we cannot let Popen get ahold of sys.stderr/out because it
+        # will attempt to close the files with nonstandard (system-level) 
+        # methods via fileno(). This causes problems on win32 from which pytest
+        # cannot correctly recover. 
+
+        def timeout_process(process):
+            # Kill the subprocess and its child processes.
+            for p in process.children(recursive=True):
+                p.kill()
+
             if runtime:
                 # When 'runtime' is set then expired timeout is a good sing
                 # that the executable was running successfully for a specified time.
                 # TODO Is there a better way return success than 'retcode = 0'?
-                retcode = 0
+                return 0
             else:
                 # Exe is still running and it is not an interactive test. Fail the test.
-                retcode = 1
-            # Kill the subprocess and its child processes.
-            for p in process.children(recursive=True):
-                p.kill()
-            process.kill()
+                return 1
+
+        # 'psutil' allows to use timeout in waiting for a subprocess.
+        # If not timeout was specified then it is 'None' - no timeout, just waiting.
+        # Runtime is useful mostly for interactive tests.
+        timeout = runtime if runtime else _EXE_TIMEOUT
+        if is_py3:
+            process = subprocess.Popen(args, executable=exe_path, stdout=subprocess.PIPE,
+                                        stderr=subprocess.PIPE, env=prog_env, cwd=prog_cwd)
+            try:
+                stdout, stderr = process.communicate(timeout=timeout)
+                retcode = process.returncode
+            except subprocess.TimeoutExpired:
+                retcode = timeout_process(psutil.Process(process.pid))
+                process.kill()
+                stdout, stderr = process.communicate()
+
+            sys.stdout.write(stdout)
+            sys.stderr.write(stderr)
+        else:
+            stderr = tempfile.TemporaryFile()
+            stdout = tempfile.TemporaryFile()
+            process = psutil.Popen(args, executable=exe_path, stdout=stdout,
+                                stderr=stderr, env=prog_env, cwd=prog_cwd)
+
+            stderr.seek(0)
+            stdout.seek(0)
+
+            shutil.copyfileobj(stderr, sys.stderr)
+            shutil.copyfileobj(stdout, sys.stdout)
+
+            try:
+                retcode = process.wait(timeout=timeout)
+            except psutil.TimeoutExpired:
+                retcode = timeout_process(process)
+                process.kill()
 
         return retcode
 

diff --git a/tests/requirements-tools.txt b/tests/requirements-tools.txt
@@ -2,10 +2,11 @@
 git+https://github.com/pytest-dev/execnet.git
 
 # For running tests
-pytest >= 2.7.3  # Testing framework.
+pytest >= 3.2.1  # Testing framework.
 pytest-xdist     # Plugin allowing running tests in parallel.
 pytest-timeout   # Plugin to abort hanging tests.
 pytest-catchlog  # Capture log output separately from stdout/stderr
 pytest-drop-dup-tests # allows specifying order without duplicates
 
 psutil  # Better subprocess alternative with implemented timeout.
+junitparser  # For compacting junit results