Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
3f48ac98
Commit
3f48ac98
authored
Jan 01, 2014
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #20055: Fix test_shutil under Windows with symlink privileges held.
Patch by Vajrasky Kok.
parent
b075cc0d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
13 deletions
+22
-13
Lib/test/test_shutil.py
Lib/test/test_shutil.py
+19
-13
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/test/test_shutil.py
View file @
3f48ac98
...
@@ -287,6 +287,8 @@ class TestShutil(unittest.TestCase):
...
@@ -287,6 +287,8 @@ class TestShutil(unittest.TestCase):
self
.
assertNotEqual
(
os
.
stat
(
src
).
st_mode
,
os
.
stat
(
dst
).
st_mode
)
self
.
assertNotEqual
(
os
.
stat
(
src
).
st_mode
,
os
.
stat
(
dst
).
st_mode
)
shutil
.
copymode
(
src
,
dst
)
shutil
.
copymode
(
src
,
dst
)
self
.
assertEqual
(
os
.
stat
(
src
).
st_mode
,
os
.
stat
(
dst
).
st_mode
)
self
.
assertEqual
(
os
.
stat
(
src
).
st_mode
,
os
.
stat
(
dst
).
st_mode
)
# On Windows, os.chmod does not follow symlinks (issue #15411)
if
os
.
name
!=
'nt'
:
# follow src link
# follow src link
os
.
chmod
(
dst
,
stat
.
S_IRWXO
)
os
.
chmod
(
dst
,
stat
.
S_IRWXO
)
shutil
.
copymode
(
src_link
,
dst
)
shutil
.
copymode
(
src_link
,
dst
)
...
@@ -297,7 +299,7 @@ class TestShutil(unittest.TestCase):
...
@@ -297,7 +299,7 @@ class TestShutil(unittest.TestCase):
self
.
assertEqual
(
os
.
stat
(
src
).
st_mode
,
os
.
stat
(
dst
).
st_mode
)
self
.
assertEqual
(
os
.
stat
(
src
).
st_mode
,
os
.
stat
(
dst
).
st_mode
)
# follow both links
# follow both links
os
.
chmod
(
dst
,
stat
.
S_IRWXO
)
os
.
chmod
(
dst
,
stat
.
S_IRWXO
)
shutil
.
copymode
(
src_link
,
dst
)
shutil
.
copymode
(
src_link
,
dst_link
)
self
.
assertEqual
(
os
.
stat
(
src
).
st_mode
,
os
.
stat
(
dst
).
st_mode
)
self
.
assertEqual
(
os
.
stat
(
src
).
st_mode
,
os
.
stat
(
dst
).
st_mode
)
@
unittest
.
skipUnless
(
hasattr
(
os
,
'lchmod'
),
'requires os.lchmod'
)
@
unittest
.
skipUnless
(
hasattr
(
os
,
'lchmod'
),
'requires os.lchmod'
)
...
@@ -1543,6 +1545,10 @@ class TestMove(unittest.TestCase):
...
@@ -1543,6 +1545,10 @@ class TestMove(unittest.TestCase):
dst_link
=
os
.
path
.
join
(
self
.
dst_dir
,
'quux'
)
dst_link
=
os
.
path
.
join
(
self
.
dst_dir
,
'quux'
)
shutil
.
move
(
dst
,
dst_link
)
shutil
.
move
(
dst
,
dst_link
)
self
.
assertTrue
(
os
.
path
.
islink
(
dst_link
))
self
.
assertTrue
(
os
.
path
.
islink
(
dst_link
))
# On Windows, os.path.realpath does not follow symlinks (issue #9949)
if
os
.
name
==
'nt'
:
self
.
assertEqual
(
os
.
path
.
realpath
(
src
),
os
.
readlink
(
dst_link
))
else
:
self
.
assertEqual
(
os
.
path
.
realpath
(
src
),
os
.
path
.
realpath
(
dst_link
))
self
.
assertEqual
(
os
.
path
.
realpath
(
src
),
os
.
path
.
realpath
(
dst_link
))
@
support
.
skip_unless_symlink
@
support
.
skip_unless_symlink
...
...
Misc/NEWS
View file @
3f48ac98
...
@@ -197,6 +197,9 @@ IDLE
...
@@ -197,6 +197,9 @@ IDLE
Tests
Tests
-----
-----
- Issue #20055: Fix test_shutil under Windows with symlink privileges held.
Patch by Vajrasky Kok.
- Issue #19938: Re-enabled test_bug_1333982 in test_dis, which had been
- Issue #19938: Re-enabled test_bug_1333982 in test_dis, which had been
disabled since 3.0 due to the changes in listcomp handling.
disabled since 3.0 due to the changes in listcomp handling.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment