diff options
author | Denis Osipov <osipov_d@list.ru> | 2017-06-08 12:02:05 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2017-06-08 12:02:05 (GMT) |
commit | ca1b66fd059758bbd6e2cc62c8f2adecefe8f942 (patch) | |
tree | f440b7db3f4f8aac8b39c0a28d3d49c7af16b1ea | |
parent | 854f7ba1d5cbb6a42511beae66c8dbe34f2cbcd3 (diff) | |
download | cpython-ca1b66fd059758bbd6e2cc62c8f2adecefe8f942.zip cpython-ca1b66fd059758bbd6e2cc62c8f2adecefe8f942.tar.gz cpython-ca1b66fd059758bbd6e2cc62c8f2adecefe8f942.tar.bz2 |
[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)
-rw-r--r-- | Lib/test/test_os.py | 4 | ||||
-rw-r--r-- | Misc/ACKS | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index e9fdb07..46ad209 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) @@ -1121,6 +1121,7 @@ William Orr Michele Orrù Tomáš Orsava Oleg Oshmyan +Denis Osipov Denis S. Otkidach Peter Otten Michael Otteneder |