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
7ccfc71b
Commit
7ccfc71b
authored
Jan 01, 2014
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Plain Diff
Issue #20055: Fix test_shutil under Windows with symlink privileges held.
Patch by Vajrasky Kok.
parents
731b9693
346c6019
Changes
2
Hide 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 @
7ccfc71b
...
@@ -288,18 +288,20 @@ class TestShutil(unittest.TestCase):
...
@@ -288,18 +288,20 @@ 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
)
# follow src link
# On Windows, os.chmod does not follow symlinks (issue #15411)
os
.
chmod
(
dst
,
stat
.
S_IRWXO
)
if
os
.
name
!=
'nt'
:
shutil
.
copymode
(
src_link
,
dst
)
# follow src link
self
.
assertEqual
(
os
.
stat
(
src
).
st_mode
,
os
.
stat
(
dst
).
st_mode
)
os
.
chmod
(
dst
,
stat
.
S_IRWXO
)
# follow dst link
shutil
.
copymode
(
src_link
,
dst
)
os
.
chmod
(
dst
,
stat
.
S_IRWXO
)
self
.
assertEqual
(
os
.
stat
(
src
).
st_mode
,
os
.
stat
(
dst
).
st_mode
)
shutil
.
copymode
(
src
,
dst_link
)
# follow dst link
self
.
assertEqual
(
os
.
stat
(
src
).
st_mode
,
os
.
stat
(
dst
).
st_mode
)
os
.
chmod
(
dst
,
stat
.
S_IRWXO
)
# follow both links
shutil
.
copymode
(
src
,
dst_link
)
os
.
chmod
(
dst
,
stat
.
S_IRWXO
)
self
.
assertEqual
(
os
.
stat
(
src
).
st_mode
,
os
.
stat
(
dst
).
st_mode
)
shutil
.
copymode
(
src_link
,
dst
)
# follow both links
self
.
assertEqual
(
os
.
stat
(
src
).
st_mode
,
os
.
stat
(
dst
).
st_mode
)
os
.
chmod
(
dst
,
stat
.
S_IRWXO
)
shutil
.
copymode
(
src_link
,
dst_link
)
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'
)
@
support
.
skip_unless_symlink
@
support
.
skip_unless_symlink
...
@@ -1554,7 +1556,11 @@ class TestMove(unittest.TestCase):
...
@@ -1554,7 +1556,11 @@ 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
))
self
.
assertEqual
(
os
.
path
.
realpath
(
src
),
os
.
path
.
realpath
(
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
))
@
support
.
skip_unless_symlink
@
support
.
skip_unless_symlink
@
mock_rename
@
mock_rename
...
...
Misc/NEWS
View file @
7ccfc71b
...
@@ -267,6 +267,9 @@ IDLE
...
@@ -267,6 +267,9 @@ IDLE
Tests
Tests
-----
-----
-
Issue
#
20055
:
Fix
test_shutil
under
Windows
with
symlink
privileges
held
.
Patch
by
Vajrasky
Kok
.
-
Issue
#
20070
:
Don
't run test_urllib2net when network resources are not
-
Issue
#
20070
:
Don
't run test_urllib2net when network resources are not
enabled.
enabled.
...
...
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