Unskip / get the end-to-end tests working for Windows.

Author: cjerdonek

src/pip/_internal/utils/logging.py

@@ -37,8 +37,30 @@ class BrokenStdoutLoggingError(Exception):
     pass
 
 
-if PY2:
-    # BrokenPipeError does not exist in Python 2.
+# BrokenPipeError does not exist in Python 2 and, in addition, manifests
+# differently in Windows and non-Windows.
+if WINDOWS:
+    # In Windows, a broken pipe can show up as EINVAL rather than EPIPE:
+    # https://bugs.python.org/issue19612
+    # https://bugs.python.org/issue30418
+    if PY2:
+        def _is_broken_pipe_error(exc_class, exc):
+            """See the docstring for non-Windows Python 3 below."""
+            return (exc_class is IOError and
+                    exc.errno in (errno.EINVAL, errno.EPIPE))
+    else:
+        # In Windows, a broken pipe IOError became OSError in Python 3.
+        def _is_broken_pipe_error(exc_class, exc):
+            """See the docstring for non-Windows Python 3 below."""
+            return ((exc_class is BrokenPipeError) or  # noqa: F821
+                    (exc_class is OSError and
+                     exc.errno in (errno.EINVAL, errno.EPIPE)))
+elif PY2:
+    def _is_broken_pipe_error(exc_class, exc):
+        """See the docstring for non-Windows Python 3 below."""
+        return (exc_class is IOError and exc.errno == errno.EPIPE)
+else:
+    # Then we are in the non-Windows Python 3 case.
     def _is_broken_pipe_error(exc_class, exc):
         """
         Return whether an exception is a broken pipe error.
@@ -47,10 +69,6 @@ def _is_broken_pipe_error(exc_class, exc):
           exc_class: an exception class.
           exc: an exception instance.
         """
-        return (exc_class is IOError and exc.errno == errno.EPIPE)
-
-else:
-    def _is_broken_pipe_error(exc_class, exc):
         return (exc_class is BrokenPipeError)  # noqa: F821
 
 

tests/functional/test_broken_stdout.py

@@ -1,10 +1,6 @@
 import subprocess
 import sys
 
-import pytest
-
-from pip._internal.utils.compat import WINDOWS
-
 if sys.version_info < (3, 6):
     _BROKEN_STDOUT_RETURN_CODE = 1
 else:
@@ -19,7 +15,6 @@ def setup_broken_stdout_test(args, deprecated_python):
     )
     # Call close() on stdout to cause a broken pipe.
     proc.stdout.close()
-    # This line causes a timeout on Windows.
     returncode = proc.wait()
     stderr = proc.stderr.read().decode('utf-8')
 
@@ -32,7 +27,6 @@ def setup_broken_stdout_test(args, deprecated_python):
     return stderr, returncode
 
 
-@pytest.mark.skipif(WINDOWS, reason="test times out on Windows")
 def test_broken_stdout_pipe(deprecated_python):
     """
     Test a broken pipe to stdout.
@@ -48,7 +42,6 @@ def test_broken_stdout_pipe(deprecated_python):
     assert returncode == _BROKEN_STDOUT_RETURN_CODE
 
 
-@pytest.mark.skipif(WINDOWS, reason="test times out on Windows")
 def test_broken_stdout_pipe__verbose(deprecated_python):
     """
     Test a broken pipe to stdout with verbose logging enabled.