traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge heads

This commit is contained in:
Senthil Kumaran 2012-03-13 00:16:17 -07:00
parent 7554f0dd3c 5738e4f3df
commit 4bd53b13c6
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Lib/unittest/loader.py
View File

@ -34,6 +34,11 @@ def _make_failed_test(classname, methodname, exception, suiteClass):
TestClass = type(classname, (case.TestCase,), attrs) TestClass = type(classname, (case.TestCase,), attrs)
return suiteClass((TestClass(methodname),)) return suiteClass((TestClass(methodname),))
def _jython_aware_splitext(path):
if path.lower().endswith('$py.class'):
return path[:-9]
return os.path.splitext(path)[0]
class TestLoader(object): class TestLoader(object):
""" """
@ -221,7 +226,7 @@ class TestLoader(object):
return os.path.dirname(full_path) return os.path.dirname(full_path)
def _get_name_from_path(self, path): def _get_name_from_path(self, path):
path = os.path.splitext(os.path.normpath(path))[0] path = _jython_aware_splitext(os.path.normpath(path))
_relpath = os.path.relpath(path, self._top_level_dir) _relpath = os.path.relpath(path, self._top_level_dir)
assert not os.path.isabs(_relpath), "Path must be within the project" assert not os.path.isabs(_relpath), "Path must be within the project"
@ -258,11 +263,11 @@ class TestLoader(object):
yield _make_failed_import_test(name, self.suiteClass) yield _make_failed_import_test(name, self.suiteClass)
else: else:
mod_file = os.path.abspath(getattr(module, '__file__', full_path)) mod_file = os.path.abspath(getattr(module, '__file__', full_path))
realpath = os.path.splitext(mod_file)[0] realpath = _jython_aware_splitext(mod_file)
fullpath_noext = os.path.splitext(full_path)[0] fullpath_noext = _jython_aware_splitext(full_path)
if realpath.lower() != fullpath_noext.lower(): if realpath.lower() != fullpath_noext.lower():
module_dir = os.path.dirname(realpath) module_dir = os.path.dirname(realpath)
mod_name = os.path.splitext(os.path.basename(full_path))[0] mod_name = _jython_aware_splitext(os.path.basename(full_path))
expected_dir = os.path.dirname(full_path) expected_dir = os.path.dirname(full_path)
msg = ("%r module incorrectly imported from %r. Expected %r. " msg = ("%r module incorrectly imported from %r. Expected %r. "
"Is this module globally installed?") "Is this module globally installed?")

2
Misc/NEWS
View File

@ -24,6 +24,8 @@ Core and Builtins
Library Library
------- -------
- Issue #10543: Fix unittest test discovery with Jython bytecode files.
- Issue #1178863: Separate initialisation from setting when initializing - Issue #1178863: Separate initialisation from setting when initializing
Tkinter.Variables; harmonize exceptions to ValueError; only delete variables Tkinter.Variables; harmonize exceptions to ValueError; only delete variables
that have not been deleted; assert that variable names are strings. that have not been deleted; assert that variable names are strings.