diff options
| author | Brian Curtin <brian.curtin@gmail.com> | 2010-12-02 18:29:18 +0000 |
|---|---|---|
| committer | Brian Curtin <brian.curtin@gmail.com> | 2010-12-02 18:29:18 +0000 |
| commit | 52173d4959a1c1e961efab2522e4ba8a22a3c7c6 (patch) | |
| tree | a89463de7c0db84aa60ef25bc05caf8837e2cc33 /Lib/test/test_tarfile.py | |
| parent | 02524629f39bb70f4ea00ab8e64d694e08719227 (diff) | |
| download | cpython-git-52173d4959a1c1e961efab2522e4ba8a22a3c7c6.tar.gz | |
Fix #9333. Expose os.symlink on Windows only when usable.
In order to create symlinks on Windows, SeCreateSymbolicLinkPrivilege
is an account privilege that is required to be held by the user. Not only
must the privilege be enabled for the account, the activated privileges for
the currently running application must be adjusted to enable the requested
privilege.
Rather than exposing an additional function to be called prior to the user's
first os.symlink call, we handle the AdjustTokenPrivileges Windows API call
internally and only expose os.symlink when the privilege escalation was
successful.
Due to the change of only exposing os.symlink when it's available, we can
go back to the original test skipping methods of checking via `hasattr`.
Diffstat (limited to 'Lib/test/test_tarfile.py')
| -rw-r--r-- | Lib/test/test_tarfile.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index ff02c69333..9d844640c8 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -322,7 +322,8 @@ class MiscReadTest(CommonReadTest): @unittest.skipUnless(hasattr(os, "link"), "Missing hardlink implementation") - @support.skip_unless_symlink + @unittest.skipUnless(hasattr(os, "symlink"), + "Missing symlink implementation") def test_extract_hardlink(self): # Test hardlink extraction (e.g. bug #857297). tar = tarfile.open(tarname, errorlevel=1, encoding="iso8859-1") @@ -840,7 +841,8 @@ class WriteTest(WriteTestBase): os.remove(target) os.remove(link) - @support.skip_unless_symlink + @unittest.skipUnless(hasattr(os, "symlink"), + "Missing symlink implementation") def test_symlink_size(self): path = os.path.join(TEMPDIR, "symlink") os.symlink("link_target", path) |