diff --git a/.travis.yml b/.travis.yml index 25f22983c..10dc1e14a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,4 +34,5 @@ script: - pytest -v --cov=telegram after_success: - coveralls \ No newline at end of file + - coverage combine + - coveralls \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index e9ce50bd4..ae23f5e89 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,8 +26,10 @@ filterwarnings = ignore::DeprecationWarning [coverage:run] -branch = False +branch = True source = telegram +parallel = True +concurrency = thread, multiprocessing omit = tests/ telegram/__main__.py diff --git a/tests/test_meta.py b/tests/test_meta.py index 472361c9d..251be0c4e 100644 --- a/tests/test_meta.py +++ b/tests/test_meta.py @@ -26,7 +26,7 @@ import pytest def call_pre_commit_hook(hook_id): __tracebackhide__ = True - return subprocess.call(['pre-commit', 'run', '--all-files', hook_id]) + return os.system(' '.join(['pre-commit', 'run', '--all-files', hook_id])) @pytest.mark.parametrize('hook_id', argvalues=('yapf', 'flake8', 'pylint')) @@ -39,4 +39,4 @@ def test_pre_commit_hook(hook_id): def test_build(): - assert subprocess.call(['python', 'setup.py', 'bdist_dumb']) == 0 + assert os.system('python setup.py bdist_dumb') == 0