Commit 4a681cd8 authored by Jason Madden's avatar Jason Madden

We need the latest beta of coveralls to work with the latest beta of coverage.

parent 264ebde7
......@@ -21,7 +21,7 @@ install:
# means that installing cython on cpython 3.5 cannot use the wheel cache, which
# means that the LINT=true case is quite slow (2.5 minutes). If this takes very long to fix,
# we might want to do some refactoring to move installation into the makefile or a script.
- travis_retry pip install -U tox cython greenlet pep8 pyflakes "coverage>=4.0b3" coveralls
- travis_retry pip install -U tox cython greenlet pep8 pyflakes "coverage>=4.0b3" "coveralls>=1.0b1"
script:
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' && $LINT == true ]]; then python setup.py develop && make travis_test_linters; elif [[ $LINT == false && $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then python setup.py develop && make fulltoxtest; elif [[ $LINT == false ]]; then python setup.py develop && make fulltoxtest; fi
notifications:
......
......@@ -91,7 +91,7 @@ travis_cpython:
travis_test_linters:
make lint
make leaktest
GEVENTTEST_COVERAGE=1 make leaktest
# XXX Can we do this here? It would be nice to get these reports, but
# first, it may cause issues with the leak tests. And second, 'coverage combine'
# chokes if a datafile hasn't been fully written, which can happen when
......
......@@ -255,7 +255,9 @@ def main():
parser.add_option("--coverage", action="store_true")
options, args = parser.parse_args()
FAILING_TESTS = []
if options.coverage:
coverage = False
if options.coverage or os.environ.get("GEVENTTEST_COVERAGE"):
coverage = True
# NOTE: This must be run from the greentest directory
os.environ['COVERAGE_PROCESS_START'] = os.path.abspath(".coveragerc")
os.environ['PYTHONPATH'] = os.path.abspath("coveragesite") + os.pathsep + os.environ.get("PYTHONPATH", "")
......@@ -267,7 +269,7 @@ def main():
config = {}
six.exec_(open(options.config).read(), config)
FAILING_TESTS = config['FAILING_TESTS']
tests = discover(args, options.ignore, options.coverage)
tests = discover(args, options.ignore, coverage)
if options.discover:
for cmd, options in tests:
print(util.getname(cmd, env=options.get('env'), setenv=options.get('setenv')))
......
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