From d9cadc5f597e5966132c9249f6c7ff0ed1eba0cb Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
 <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 4 Dec 2017 21:03:29 -0800
Subject: [PATCH] [3.6] bpo-31380: Skip test_httpservers test_undecodable_file
 on macOS. (GH-4720) (#4721)

The undecodable file name cannot be created on macOS APFS file systems.
(cherry picked from commit b3edde8dd44c878e9f039a2165d00ff075157d4b)
---
 Lib/test/test_httpservers.py                                   | 3 ++-
 .../NEWS.d/next/Tests/2017-12-04-23-19-16.bpo-31380.VlMmHW.rst | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 Misc/NEWS.d/next/Tests/2017-12-04-23-19-16.bpo-31380.VlMmHW.rst

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 22b3bf5235..66e937e04b 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -370,7 +370,8 @@ class SimpleHTTPServerTestCase(BaseTestCase):
         reader.close()
         return body
 
-    @support.requires_mac_ver(10, 5)
+    @unittest.skipIf(sys.platform == 'darwin',
+                     'undecodable name cannot always be decoded on macOS')
     @unittest.skipIf(sys.platform == 'win32',
                      'undecodable name cannot be decoded on win32')
     @unittest.skipUnless(support.TESTFN_UNDECODABLE,
diff --git a/Misc/NEWS.d/next/Tests/2017-12-04-23-19-16.bpo-31380.VlMmHW.rst b/Misc/NEWS.d/next/Tests/2017-12-04-23-19-16.bpo-31380.VlMmHW.rst
new file mode 100644
index 0000000000..2baecf5adc
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2017-12-04-23-19-16.bpo-31380.VlMmHW.rst
@@ -0,0 +1 @@
+Skip test_httpservers test_undecodable_file on macOS: fails on APFS.
-- 
2.40.0