mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-17 09:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Improve the test case to avoid spurious errors about already existing symlinks.

Browse source
This commit is contained in:
Jason R. Coombs 2012-03-08 10:31:29 -05:00
parent 0e17dfbdcf
commit ea4629afa6
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/test/test_import.py
View file

@ -494,7 +494,10 @@ class TestSymbolicallyLinkedPackage(unittest.TestCase):
package_name = 'sample' package_name = 'sample'
def setUp(self): def setUp(self):
if os.path.exists('sample-tagged'): shutil.rmtree('sample-tagged') if os.path.exists(self.tagged):
shutil.rmtree(self.tagged)
if os.path.exists(self.package_name):
self.remove_symlink(self.package_name)
self.orig_sys_path = sys.path[:] self.orig_sys_path = sys.path[:]
symlink = getattr(os, 'symlink', None) or self._symlink_win32 symlink = getattr(os, 'symlink', None) or self._symlink_win32
@ -583,23 +586,30 @@ class TestSymbolicallyLinkedPackage(unittest.TestCase):
# regression test for issue6727 # regression test for issue6727
@unittest.skipUnless( @unittest.skipUnless(
not hasattr(sys, 'getwindowsversion') not hasattr(sys, 'getwindowsversion')
or sys.getwindowsversion() >= (6,0), or sys.getwindowsversion() >= (6, 0),
"Windows Vista or later required") "Windows Vista or later required")
def test_symlinked_dir_importable(self): def test_symlinked_dir_importable(self):
# make sure sample can only be imported from the current directory. # make sure sample can only be imported from the current directory.
sys.path[:] = ['.'] sys.path[:] = ['.']
# and try to import the package # and try to import the package
pkg = __import__(self.package_name) __import__(self.package_name)
def tearDown(self): def tearDown(self):
# now cleanup # now cleanup
if os.path.exists(self.package_name): if os.path.exists(self.package_name):
os.rmdir(self.package_name) self.remove_symlink(self.package_name)
if os.path.exists(self.tagged): if os.path.exists(self.tagged):
shutil.rmtree(self.tagged) shutil.rmtree(self.tagged)
sys.path[:] = self.orig_sys_path sys.path[:] = self.orig_sys_path
@staticmethod
def remove_symlink(name):
# On Windows, to remove a directory symlink, one must use rmdir
try:
os.rmdir(name)
except OSError:
os.remove(name)
def test_main(verbose=None): def test_main(verbose=None):
run_unittest(ImportTests, PycRewritingTests, PathsTests, run_unittest(ImportTests, PycRewritingTests, PathsTests,