Merge branch 'stable'

tests/test_build.py

@@ -15,6 +15,7 @@ import mock
 import pytest
 from textwrap import dedent
 from sphinx.errors import SphinxError
+import sys
 
 from sphinx.testing.path import path
 
@@ -31,6 +32,11 @@ def nonascii_srcdir(request, rootdir, sphinx_test_tempdir):
     # If supported, build in a non-ASCII source dir
     test_name = u'\u65e5\u672c\u8a9e'
     basedir = sphinx_test_tempdir / request.node.originalname
+    # Windows with versions prior to 3.2 (I think) doesn't support unicode on system path
+    # so we force a non-unicode path in that case
+    if sys.platform == "win32" and \
+        not (sys.version_info.major >= 3 and sys.version_info.minor >= 2):
+        return basedir / 'all'
     try:
         srcdir = basedir / test_name
         if not srcdir.exists():
@@ -64,6 +70,7 @@ def nonascii_srcdir(request, rootdir, sphinx_test_tempdir):
 )
 @mock.patch('sphinx.builders.linkcheck.requests.head',
             side_effect=request_session_head)
+@pytest.mark.xfail(sys.platform == 'win32', reason="Not working on windows")
 def test_build_all(requests_head, make_app, nonascii_srcdir, buildername):
     app = make_app(buildername, srcdir=nonascii_srcdir)
     app.build()