summaryrefslogtreecommitdiffstats
path: root/Lib/unittest
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2013-10-23 17:11:29 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2013-10-23 17:11:29 (GMT)
commitd5d0bc35adc6c043d5985152451505e70d869341 (patch)
tree3057814c4d701ba5f0b8e7aa0fd8443ffdb1dd5f /Lib/unittest
parentdde25c485158b652ed34581cb977eb5bd439ade0 (diff)
downloadcpython-d5d0bc35adc6c043d5985152451505e70d869341.zip
cpython-d5d0bc35adc6c043d5985152451505e70d869341.tar.gz
cpython-d5d0bc35adc6c043d5985152451505e70d869341.tar.bz2
Issue #19352: Fix unittest discovery when a module can be reached through several paths (e.g. under Debian/Ubuntu with virtualenv).
Diffstat (limited to 'Lib/unittest')
-rw-r--r--Lib/unittest/loader.py4
-rw-r--r--Lib/unittest/test/test_discovery.py24
2 files changed, 25 insertions, 3 deletions
diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py
index 2b92525..9ab26c1 100644
--- a/Lib/unittest/loader.py
+++ b/Lib/unittest/loader.py
@@ -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))
diff --git a/Lib/unittest/test/test_discovery.py b/Lib/unittest/test/test_discovery.py
index 1fdf991..ccc7db2 100644
--- a/Lib/unittest/test/test_discovery.py
+++ b/Lib/unittest/test/test_discovery.py
@@ -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()