From: Denis Osipov <osipov_d@list.ru>
Date: Thu, 8 Jun 2017 12:02:05 +0000 (+0500)
Subject: [3.6] bpo-30584: Fix test_os fails on non-English Windows (GH-1980) (#1999)
X-Git-Tag: v3.6.2rc1~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca1b66fd059758bbd6e2cc62c8f2adecefe8f942;p=thirdparty%2FPython%2Fcpython.git

[3.6] bpo-30584: Fix test_os fails on non-English Windows (GH-1980) (#1999)

* Fix bpo-30584

* Adding a comment mentionning the bpo and explaining what is the identifier

* Add Denis Osipov to Misc/ACKS
(cherry picked from commit 897bba75632dfce87c355e3cd4700468357715a7)
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index e9fdb0719f4b..46ad2099a9f5 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -473,7 +473,9 @@ class StatAttributeTests(unittest.TestCase):
         # force CreateFile to fail with ERROR_ACCESS_DENIED.
         DETACHED_PROCESS = 8
         subprocess.check_call(
-            ['icacls.exe', fname, '/deny', 'Users:(S)'],
+            # bpo-30584: Use security identifier *S-1-5-32-545 instead
+            # of localized "Users" to not depend on the locale.
+            ['icacls.exe', fname, '/deny', '*S-1-5-32-545:(S)'],
             creationflags=DETACHED_PROCESS
         )
         result = os.stat(fname)
diff --git a/Misc/ACKS b/Misc/ACKS
index bbdc69d9c9fd..c2ebf7faa40a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1121,6 +1121,7 @@ William Orr
 Michele Orrù
 Tomáš Orsava
 Oleg Oshmyan
+Denis Osipov
 Denis S. Otkidach
 Peter Otten
 Michael Otteneder