Commit d5f4a5a4 authored by scoder's avatar scoder Committed by GitHub

Merge pull request #1900 from MaxBo/MaxBo-patch-1

Update Coverage.py 
parents 19f9dbbb 4ef6bb83
...@@ -12,6 +12,7 @@ import sys ...@@ -12,6 +12,7 @@ import sys
from collections import defaultdict from collections import defaultdict
from coverage.plugin import CoveragePlugin, FileTracer, FileReporter # requires coverage.py 4.0+ from coverage.plugin import CoveragePlugin, FileTracer, FileReporter # requires coverage.py 4.0+
from coverage.files import canonical_filename
from .Utils import find_root_package_dir, is_package_dir, open_source_file from .Utils import find_root_package_dir, is_package_dir, open_source_file
...@@ -41,8 +42,8 @@ def _find_dep_file_path(main_file, file_path): ...@@ -41,8 +42,8 @@ def _find_dep_file_path(main_file, file_path):
for sys_path in sys.path: for sys_path in sys.path:
test_path = os.path.realpath(os.path.join(sys_path, file_path)) test_path = os.path.realpath(os.path.join(sys_path, file_path))
if os.path.exists(test_path): if os.path.exists(test_path):
return test_path return canonical_filename(test_path)
return abs_path return canonical_filename(abs_path)
class Plugin(CoveragePlugin): class Plugin(CoveragePlugin):
...@@ -63,7 +64,7 @@ class Plugin(CoveragePlugin): ...@@ -63,7 +64,7 @@ class Plugin(CoveragePlugin):
if filename.startswith('<') or filename.startswith('memory:'): if filename.startswith('<') or filename.startswith('memory:'):
return None return None
c_file = py_file = None c_file = py_file = None
filename = os.path.abspath(filename) filename = canonical_filename(os.path.abspath(filename))
if self._c_files_map and filename in self._c_files_map: if self._c_files_map and filename in self._c_files_map:
c_file = self._c_files_map[filename][0] c_file = self._c_files_map[filename][0]
...@@ -91,7 +92,7 @@ class Plugin(CoveragePlugin): ...@@ -91,7 +92,7 @@ class Plugin(CoveragePlugin):
# from coverage.python import PythonFileReporter # from coverage.python import PythonFileReporter
# return PythonFileReporter(filename) # return PythonFileReporter(filename)
filename = os.path.abspath(filename) filename = canonical_filename(os.path.abspath(filename))
if self._c_files_map and filename in self._c_files_map: if self._c_files_map and filename in self._c_files_map:
c_file, rel_file_path, code = self._c_files_map[filename] c_file, rel_file_path, code = self._c_files_map[filename]
else: else:
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# tag: coverage,trace # tag: coverage,trace
""" """
PYTHON -c 'import shutil; shutil.copy("pkg/coverage_test_pyx.pyx", "pkg/coverage_test_pyx.pxi")' PYTHON -c "import shutil; shutil.copy('pkg/coverage_test_pyx.pyx', 'pkg/coverage_test_pyx.pxi')"
PYTHON setup.py build_ext -i PYTHON setup.py build_ext -i
PYTHON coverage_test.py PYTHON coverage_test.py
""" """
...@@ -14,7 +14,8 @@ from Cython.Build import cythonize ...@@ -14,7 +14,8 @@ from Cython.Build import cythonize
setup(ext_modules = cythonize([ setup(ext_modules = cythonize([
'coverage_test_*.py*', 'coverage_test_*.py*',
'pkg/coverage_test_*.py*' 'pkg/coverage_test_*.py*',
'Package2/CoverageTest_*.py*'
])) ]))
...@@ -68,6 +69,52 @@ def main_func(int x): # 11 ...@@ -68,6 +69,52 @@ def main_func(int x): # 11
return cfunc1(x) + func1(x, 4) + func2(x) # 12 return cfunc1(x) + func1(x, 4) + func2(x) # 12
######## Package2/__init__.py ########
# Add MixedCase package and filenames to test if the files are found
######## Package2/CoverageTest_py.py ########
# cython: linetrace=True
# distutils: define_macros=CYTHON_TRACE=1
def func1(a, b):
x = 1 # 5
c = func2(a) + b # 6
return x + c # 7
def func2(a):
return a * 2 # 11
######## Package2/CoverageTest_pyx.pyx ########
# cython: linetrace=True
# distutils: define_macros=CYTHON_TRACE=1
def func1(int a, int b):
cdef int x = 1 # 5
c = func2(a) + b # 6
return x + c # 7
def func2(int a):
return a * 2 # 11
######## coverage_test_include_pyx.pyx ########
# cython: linetrace=True
# distutils: define_macros=CYTHON_TRACE=1
cdef int x = 5 # 4
cdef int cfunc1(int x): # 6
return x * 3 # 7
include "pkg/coverage_test_pyx.pxi" # 9
def main_func(int x): # 11
return cfunc1(x) + func1(x, 4) + func2(x) # 12
######## coverage_test.py ######## ######## coverage_test.py ########
import re import re
...@@ -84,8 +131,12 @@ from pkg import coverage_test_py ...@@ -84,8 +131,12 @@ from pkg import coverage_test_py
from pkg import coverage_test_pyx from pkg import coverage_test_pyx
import coverage_test_include_pyx import coverage_test_include_pyx
# test the MixedCase Files and packages
from Package2 import CoverageTest_py
from Package2 import CoverageTest_pyx
for module in [coverage_test_py, coverage_test_pyx, coverage_test_include_pyx]: for module in [coverage_test_py, coverage_test_pyx, coverage_test_include_pyx,
CoverageTest_py, CoverageTest_pyx]:
assert not any(module.__file__.endswith(ext) for ext in '.py .pyc .pyo .pyw .pyx .pxi'.split()), \ assert not any(module.__file__.endswith(ext) for ext in '.py .pyc .pyo .pyw .pyx .pxi'.split()), \
module.__file__ module.__file__
...@@ -93,10 +144,18 @@ for module in [coverage_test_py, coverage_test_pyx, coverage_test_include_pyx]: ...@@ -93,10 +144,18 @@ for module in [coverage_test_py, coverage_test_pyx, coverage_test_include_pyx]:
def source_file_for(module): def source_file_for(module):
module_name = module.__name__ module_name = module.__name__
path, ext = os.path.splitext(module.__file__) path, ext = os.path.splitext(module.__file__)
platform_suffix = re.search(r'[.](?:cpython|pypy)-[0-9]+[^.]*$', path, re.I) if ext == '.so':
# Linux/Unix/Mac extension module
platform_suffix = re.search(r'[.](?:cpython|pypy)-[0-9]+[-_a-z0-9]*$', path, re.I)
if platform_suffix:
path = path[:platform_suffix.start()]
elif ext == '.pyd':
# Windows extension module
platform_suffix = re.search(r'[.]cp[0-9]+-win[_a-z0-9]*$', path, re.I)
if platform_suffix: if platform_suffix:
path = path[:platform_suffix.start()] path = path[:platform_suffix.start()]
return path + '.' + module_name.rsplit('_', 1)[-1] source_filepath = path + '.' + module_name.rsplit('_', 1)[-1]
return source_filepath
def run_coverage(module): def run_coverage(module):
...@@ -137,3 +196,5 @@ if __name__ == '__main__': ...@@ -137,3 +196,5 @@ if __name__ == '__main__':
run_coverage(coverage_test_py) run_coverage(coverage_test_py)
run_coverage(coverage_test_pyx) run_coverage(coverage_test_pyx)
run_coverage(coverage_test_include_pyx) run_coverage(coverage_test_include_pyx)
run_coverage(CoverageTest_py)
run_coverage(CoverageTest_pyx)
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# tag: coverage,trace # tag: coverage,trace
""" """
PYTHON -c 'import shutil; shutil.copy("pkg/coverage_test_pyx.pyx", "pkg/coverage_test_pyx.pxi")' PYTHON -c "import shutil; shutil.copy('pkg/coverage_test_pyx.pyx', 'pkg/coverage_test_pyx.pxi')"
PYTHON setup.py build_ext -i PYTHON setup.py build_ext -i
PYTHON -m coverage run coverage_test.py PYTHON -m coverage run coverage_test.py
PYTHON collect_coverage.py PYTHON collect_coverage.py
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment