Issue #19352: Fix unittest discovery when a module can be reached through several paths (e.g. under Debian/Ubuntu with virtualenv).
This commit is contained in:
parent
dde25c4851
commit
d5d0bc35ad
|
@ -263,8 +263,8 @@ class TestLoader(object):
|
|||
yield _make_failed_import_test(name, self.suiteClass)
|
||||
else:
|
||||
mod_file = os.path.abspath(getattr(module, '__file__', full_path))
|
||||
realpath = _jython_aware_splitext(mod_file)
|
||||
fullpath_noext = _jython_aware_splitext(full_path)
|
||||
realpath = _jython_aware_splitext(os.path.realpath(mod_file))
|
||||
fullpath_noext = _jython_aware_splitext(os.path.realpath(full_path))
|
||||
if realpath.lower() != fullpath_noext.lower():
|
||||
module_dir = os.path.dirname(realpath)
|
||||
mod_name = _jython_aware_splitext(os.path.basename(full_path))
|
||||
|
|
|
@ -347,7 +347,7 @@ class TestDiscovery(unittest.TestCase):
|
|||
self.assertTrue(program.failfast)
|
||||
self.assertTrue(program.catchbreak)
|
||||
|
||||
def test_detect_module_clash(self):
|
||||
def setup_module_clash(self):
|
||||
class Module(object):
|
||||
__file__ = 'bar/foo.py'
|
||||
sys.modules['foo'] = Module
|
||||
|
@ -374,7 +374,10 @@ class TestDiscovery(unittest.TestCase):
|
|||
os.listdir = listdir
|
||||
os.path.isfile = isfile
|
||||
os.path.isdir = isdir
|
||||
return full_path
|
||||
|
||||
def test_detect_module_clash(self):
|
||||
full_path = self.setup_module_clash()
|
||||
loader = unittest.TestLoader()
|
||||
|
||||
mod_dir = os.path.abspath('bar')
|
||||
|
@ -387,6 +390,25 @@ class TestDiscovery(unittest.TestCase):
|
|||
)
|
||||
self.assertEqual(sys.path[0], full_path)
|
||||
|
||||
def test_module_symlink_ok(self):
|
||||
full_path = self.setup_module_clash()
|
||||
|
||||
original_realpath = os.path.realpath
|
||||
|
||||
mod_dir = os.path.abspath('bar')
|
||||
expected_dir = os.path.abspath('foo')
|
||||
|
||||
def cleanup():
|
||||
os.path.realpath = original_realpath
|
||||
self.addCleanup(cleanup)
|
||||
|
||||
def realpath(path):
|
||||
if path == os.path.join(mod_dir, 'foo.py'):
|
||||
return os.path.join(expected_dir, 'foo.py')
|
||||
return path
|
||||
os.path.realpath = realpath
|
||||
loader = unittest.TestLoader()
|
||||
loader.discover(start_dir='foo', pattern='foo.py')
|
||||
|
||||
def test_discovery_from_dotted_path(self):
|
||||
loader = unittest.TestLoader()
|
||||
|
|
|
@ -81,6 +81,9 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #19352: Fix unittest discovery when a module can be reached
|
||||
through several paths (e.g. under Debian/Ubuntu with virtualenv).
|
||||
|
||||
- Issue #15207: Fix mimetypes to read from correct part of Windows registry
|
||||
Original patch by Dave Chambers
|
||||
|
||||
|
|
Loading…
Reference in New Issue