[Python-checkins] cpython: Restored test by specifying that the symlink links to a target (currently

jason.coombs python-checkins at python.org
Thu Jul 26 21:21:41 CEST 2012


http://hg.python.org/cpython/rev/5bf7afd944a2
changeset:   78289:5bf7afd944a2
parent:      78287:e2ab56295b56
user:        Jason R. Coombs <jaraco at jaraco.com>
date:        Thu Jul 26 15:21:17 2012 -0400
summary:
  Restored test by specifying that the symlink links to a target (currently required for Windows symlinks). See issue15093 for details.

files:
  Lib/test/test_import.py |  5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -721,12 +721,11 @@
 
         # now create a symlink to the tagged package
         # sample -> sample-tagged
-        os.symlink(self.tagged, self.package_name)
+        os.symlink(self.tagged, self.package_name, target_is_directory=True)
         self.addCleanup(test.support.unlink, self.package_name)
         importlib.invalidate_caches()
 
-        # disabled because os.isdir currently fails (see issue 15093)
-        # self.assertEqual(os.path.isdir(self.package_name), True)
+        self.assertEqual(os.path.isdir(self.package_name), True)
 
         assert os.path.isfile(os.path.join(self.package_name, '__init__.py'))
 

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list