1
0
forked from VimPlug/jedi

Use Python 3.7 for calculating test coverage

This commit is contained in:
Dave Halter
2020-01-01 23:24:10 +01:00
parent a36d609756
commit 9824929ad1
2 changed files with 7 additions and 6 deletions

View File

@@ -18,17 +18,17 @@ env:
matrix: matrix:
include: include:
- python: 3.6 - python: 3.7
env: env:
- TOXENV=cov - TOXENV=cov-py37
- JEDI_TEST_ENVIRONMENT=36 - JEDI_TEST_ENVIRONMENT=37
# For now ignore pypy, there are so many issues that we don't really need # For now ignore pypy, there are so many issues that we don't really need
# to run it. # to run it.
#- python: pypy #- python: pypy
# The 3.9 dev build does not seem to be available end 2019. # The 3.9 dev build does not seem to be available end 2019.
#- python: 3.9-dev #- python: 3.9-dev
# env: # env:
# - JEDI_TEST_ENVIRONMENT=38 # - JEDI_TEST_ENVIRONMENT=39
install: install:
- pip install --quiet tox-travis - pip install --quiet tox-travis
script: script:
@@ -62,7 +62,7 @@ script:
- tox - tox
after_script: after_script:
- | - |
if [ $TOXENV == "cov" ]; then if [ $TOXENV == "cov-py37" ]; then
pip install --quiet codecov coveralls pip install --quiet codecov coveralls
coverage xml coverage xml
coverage report -m coverage report -m

View File

@@ -206,7 +206,8 @@ class IntegrationTestCase(BaseTestCase):
TEST_GOTO: self.run_goto, TEST_GOTO: self.run_goto,
TEST_REFERENCES: self.run_find_references, TEST_REFERENCES: self.run_find_references,
} }
if self.path.endswith('pytest.py') and environment.executable != sys.executable: if self.path.endswith('pytest.py') \
and environment.executable != os.path.realpath(sys.executable):
# It's not guarantueed that pytest is installed in test # It's not guarantueed that pytest is installed in test
# environments, if we're not running in the same environment that # environments, if we're not running in the same environment that
# we're already in, so just skip that case. # we're already in, so just skip that case.